Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/rt2x00/Kconfig
	drivers/net/wireless/rt2x00/rt2x00usb.c
	net/sctp/protocol.c

diff --cc drivers/net/wireless/b43/b43.h
Simple merge

diff --cc drivers/net/wireless/b43/dma.c
Simple merge

diff --cc drivers/net/wireless/b43/main.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/Kconfig
index 0ace761,2d61187..3a9b1d7
--- 1/drivers/net/wireless/rt2x00/Kconfig
--- 2/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
@@@ -41,10 -38,10 +42,10 @@@ config RT2X00_LIB_RFKIL
  
  config RT2X00_LIB_LEDS
        boolean
-       depends on RT2X00_LIB
+       depends on RT2X00_LIB && NEW_LEDS
  
  config RT2400PCI
 -      tristate "Ralink rt2400 pci/pcmcia support"
 +      tristate "Ralink rt2400 (PCI/PCMCIA) support"
        depends on PCI
        select RT2X00_LIB_PCI
        select EEPROM_93CX6
@@@ -55,17 -51,17 +56,17 @@@
          When compiled as a module, this driver will be called "rt2400pci.ko".
  
  config RT2400PCI_RFKILL
 -      bool "RT2400 rfkill support"
 +      bool "Ralink rt2400 rfkill support"
-       depends on RT2400PCI
+       depends on RT2400PCI && INPUT
        select RT2X00_LIB_RFKILL
        ---help---
 -        This adds support for integrated rt2400 devices that feature a
 +        This adds support for integrated rt2400 hardware that features a
          hardware button to control the radio state.
          This feature depends on the RF switch subsystem rfkill.
  
  config RT2400PCI_LEDS
 -      bool "RT2400 leds support"
 +      bool "Ralink rt2400 leds support"
-       depends on RT2400PCI
+       depends on RT2400PCI && NEW_LEDS
        select LEDS_CLASS
        select RT2X00_LIB_LEDS
        ---help---
@@@ -83,17 -78,17 +84,17 @@@ config RT2500PC
          When compiled as a module, this driver will be called "rt2500pci.ko".
  
  config RT2500PCI_RFKILL
 -      bool "RT2500 rfkill support"
 +      bool "Ralink rt2500 rfkill support"
-       depends on RT2500PCI
+       depends on RT2500PCI && INPUT
        select RT2X00_LIB_RFKILL
        ---help---
 -        This adds support for integrated rt2500 devices that feature a
 +        This adds support for integrated rt2500 hardware that features a
          hardware button to control the radio state.
          This feature depends on the RF switch subsystem rfkill.
  
  config RT2500PCI_LEDS
 -      bool "RT2500 leds support"
 +      bool "Ralink rt2500 leds support"
-       depends on RT2500PCI
+       depends on RT2500PCI && NEW_LEDS
        select LEDS_CLASS
        select RT2X00_LIB_LEDS
        ---help---
@@@ -113,17 -107,17 +114,17 @@@ config RT61PC
          When compiled as a module, this driver will be called "rt61pci.ko".
  
  config RT61PCI_RFKILL
 -      bool "RT61 rfkill support"
 +      bool "Ralink rt2501/rt61 rfkill support"
-       depends on RT61PCI
+       depends on RT61PCI && INPUT
        select RT2X00_LIB_RFKILL
        ---help---
 -        This adds support for integrated rt61 devices that feature a
 +        This adds support for integrated rt61 hardware that features a
          hardware button to control the radio state.
          This feature depends on the RF switch subsystem rfkill.
  
  config RT61PCI_LEDS
 -      bool "RT61 leds support"
 +      bool "Ralink rt2501/rt61 leds support"
-       depends on RT61PCI
+       depends on RT61PCI && NEW_LEDS
        select LEDS_CLASS
        select RT2X00_LIB_LEDS
        ---help---
@@@ -140,8 -133,8 +141,8 @@@ config RT2500US
          When compiled as a module, this driver will be called "rt2500usb.ko".
  
  config RT2500USB_LEDS
 -      bool "RT2500 leds support"
 +      bool "Ralink rt2500 leds support"
-       depends on RT2500USB
+       depends on RT2500USB && NEW_LEDS
        select LEDS_CLASS
        select RT2X00_LIB_LEDS
        ---help---
@@@ -160,8 -152,8 +161,8 @@@ config RT73US
          When compiled as a module, this driver will be called "rt73usb.ko".
  
  config RT73USB_LEDS
 -      bool "RT73 leds support"
 +      bool "Ralink rt2501/rt73 leds support"
-       depends on RT73USB
+       depends on RT73USB && NEW_LEDS
        select LEDS_CLASS
        select RT2X00_LIB_LEDS
        ---help---

diff --cc drivers/net/wireless/rt2x00/rt2x00pci.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00usb.c
index 68d87f0,e5ceae8..3080969
--- 1/drivers/net/wireless/rt2x00/rt2x00usb.c
--- 2/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@@ -345,12 -363,25 +345,15 @@@ void rt2x00usb_disable_radio(struct rt2
        }
  
        /*
-        * Kill guardian urb.
+        * Kill guardian urb (if required by driver).
         */
+       if (!test_bit(DRIVER_REQUIRE_BEACON_GUARD, &rt2x00dev->flags))
+               return;
+ 
        for (i = 0; i < rt2x00dev->bcn->limit; i++) {
 -              priv_bcn = rt2x00dev->bcn->entries[i].priv_data;
 -              usb_kill_urb(priv_bcn->urb);
 -
 -              if (priv_bcn->guardian_urb)
 -                      usb_kill_urb(priv_bcn->guardian_urb);
 -      }
 -
 -      if (!test_bit(DRIVER_REQUIRE_ATIM_QUEUE, &rt2x00dev->flags))
 -              return;
 -
 -      for (i = 0; i < rt2x00dev->bcn[1].limit; i++) {
 -              priv_tx = rt2x00dev->bcn[1].entries[i].priv_data;
 -              usb_kill_urb(priv_tx->urb);
 +              bcn_priv = rt2x00dev->bcn->entries[i].priv_data;
 +              if (bcn_priv->guardian_urb)
 +                      usb_kill_urb(bcn_priv->guardian_urb);
        }
  }
  EXPORT_SYMBOL_GPL(rt2x00usb_disable_radio);

diff --cc drivers/net/wireless/rt2x00/rt73usb.c
Simple merge

diff --cc net/ipv4/inet_connection_sock.c
Simple merge

diff --cc net/ipv4/raw.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/ipv6/sit.c
Simple merge

diff --cc net/mac80211/wext.c
Simple merge

diff --cc net/mac80211/wme.c
Simple merge

diff --cc net/sched/sch_htb.c
index 2130718,6807c97..2cef8f3
--- 1/net/sched/sch_htb.c
--- 2/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@@ -24,8 -24,11 +24,9 @@@
   *            Jiri Fojtasek
   *                    fixed requeue routine
   *            and many others. thanks.
 - *
 - * $Id: sch_htb.c,v 1.25 2003/12/07 11:08:25 devik Exp devik $
   */
  #include <linux/module.h>
+ #include <linux/moduleparam.h>
  #include <linux/types.h>
  #include <linux/kernel.h>
  #include <linux/string.h>

diff --cc net/sctp/associola.c
Simple merge

diff --cc net/sctp/protocol.c
index d6af466,9258dfe..23aaffb
--- 1/net/sctp/protocol.c
--- 2/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@@ -108,16 -108,23 +108,27 @@@ static __init int sctp_proc_init(void
        }
  
        if (sctp_snmp_proc_init())
-               goto out_nomem;
+               goto out_snmp_proc_init;
        if (sctp_eps_proc_init())
-               goto out_nomem;
+               goto out_eps_proc_init;
        if (sctp_assocs_proc_init())
-               goto out_nomem;
+               goto out_assocs_proc_init;
 +      if (sctp_remaddr_proc_init())
-               goto out_nomem;
++              goto out_remaddr_proc_init;
  
        return 0;
  
++out_remaddr_proc_init:
++      sctp_remaddr_proc_exit();
+ out_assocs_proc_init:
+       sctp_eps_proc_exit();
+ out_eps_proc_init:
+       sctp_snmp_proc_exit();
+ out_snmp_proc_init:
+       if (proc_net_sctp) {
+               proc_net_sctp = NULL;
+               remove_proc_entry("sctp", init_net.proc_net);
+       }
  out_nomem:
        return -ENOMEM;
  }