/spare/repo/netdev-2.6 branch 'master'

diff --combined drivers/net/wireless/orinoco.c
index 4d0b5a3,9c2d07c..d794735
--- 1/drivers/net/wireless/orinoco.c
--- 2/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@@ -94,8 -94,6 +94,8 @@@
  #include <net/iw_handler.h>
  #include <net/ieee80211.h>
  
 +#include <net/ieee80211.h>
 +
  #include <asm/uaccess.h>
  #include <asm/io.h>
  #include <asm/system.h>
@@@ -103,6 -101,7 +103,6 @@@
  #include "hermes.h"
  #include "hermes_rid.h"
  #include "orinoco.h"
 -#include "ieee802_11.h"
  
  /********************************************************************/
  /* Module information                                               */
@@@ -151,7 -150,7 +151,7 @@@ static const u8 encaps_hdr[] = {0xaa, 0
  #define ENCAPS_OVERHEAD               (sizeof(encaps_hdr) + 2)
  
  #define ORINOCO_MIN_MTU               256
 -#define ORINOCO_MAX_MTU               (IEEE802_11_DATA_LEN - ENCAPS_OVERHEAD)
 +#define ORINOCO_MAX_MTU               (IEEE80211_DATA_LEN - ENCAPS_OVERHEAD)
  
  #define SYMBOL_MAX_VER_LEN    (14)
  #define USER_BAP              0
@@@ -443,7 -442,7 +443,7 @@@ static int orinoco_change_mtu(struct ne
        if ( (new_mtu < ORINOCO_MIN_MTU) || (new_mtu > ORINOCO_MAX_MTU) )
                return -EINVAL;
  
 -      if ( (new_mtu + ENCAPS_OVERHEAD + IEEE802_11_HLEN) >
 +      if ( (new_mtu + ENCAPS_OVERHEAD + IEEE80211_HLEN) >
             (priv->nicbuf_size - ETH_HLEN) )
                return -EINVAL;
  
@@@ -919,7 -918,7 +919,7 @@@ static void __orinoco_ev_rx(struct net_
                     data. */
                return;
        }
 -      if (length > IEEE802_11_DATA_LEN) {
 +      if (length > IEEE80211_DATA_LEN) {
                printk(KERN_WARNING "%s: Oversized frame received (%d bytes)\n",
                       dev->name, length);
                stats->rx_length_errors++;
@@@ -2273,7 -2272,7 +2273,7 @@@ static int orinoco_init(struct net_devi
  
        /* No need to lock, the hw_unavailable flag is already set in
         * alloc_orinocodev() */
 -      priv->nicbuf_size = IEEE802_11_FRAME_LEN + ETH_HLEN;
 +      priv->nicbuf_size = IEEE80211_FRAME_LEN + ETH_HLEN;
  
        /* Initialize the firmware */
        err = orinoco_reinit_firmware(dev);
@@@ -4323,36 -4322,36 +4323,36 @@@ static const struct iw_priv_args orinoc
   */
  
  static const iw_handler       orinoco_handler[] = {
-       [SIOCSIWCOMMIT-SIOCIWFIRST] (iw_handler) orinoco_ioctl_commit,
-       [SIOCGIWNAME  -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getname,
-       [SIOCSIWFREQ  -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setfreq,
-       [SIOCGIWFREQ  -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getfreq,
-       [SIOCSIWMODE  -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setmode,
-       [SIOCGIWMODE  -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getmode,
-       [SIOCSIWSENS  -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setsens,
-       [SIOCGIWSENS  -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getsens,
-       [SIOCGIWRANGE -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getiwrange,
-       [SIOCSIWSPY   -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setspy,
-       [SIOCGIWSPY   -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getspy,
-       [SIOCSIWAP    -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setwap,
-       [SIOCGIWAP    -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getwap,
-       [SIOCSIWSCAN  -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setscan,
-       [SIOCGIWSCAN  -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getscan,
-       [SIOCSIWESSID -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setessid,
-       [SIOCGIWESSID -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getessid,
-       [SIOCSIWNICKN -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setnick,
-       [SIOCGIWNICKN -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getnick,
-       [SIOCSIWRATE  -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setrate,
-       [SIOCGIWRATE  -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getrate,
-       [SIOCSIWRTS   -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setrts,
-       [SIOCGIWRTS   -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getrts,
-       [SIOCSIWFRAG  -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setfrag,
-       [SIOCGIWFRAG  -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getfrag,
-       [SIOCGIWRETRY -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getretry,
-       [SIOCSIWENCODE-SIOCIWFIRST] (iw_handler) orinoco_ioctl_setiwencode,
-       [SIOCGIWENCODE-SIOCIWFIRST] (iw_handler) orinoco_ioctl_getiwencode,
-       [SIOCSIWPOWER -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setpower,
-       [SIOCGIWPOWER -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getpower,
+       [SIOCSIWCOMMIT-SIOCIWFIRST] = (iw_handler) orinoco_ioctl_commit,
+       [SIOCGIWNAME  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getname,
+       [SIOCSIWFREQ  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setfreq,
+       [SIOCGIWFREQ  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getfreq,
+       [SIOCSIWMODE  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setmode,
+       [SIOCGIWMODE  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getmode,
+       [SIOCSIWSENS  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setsens,
+       [SIOCGIWSENS  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getsens,
+       [SIOCGIWRANGE -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getiwrange,
+       [SIOCSIWSPY   -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setspy,
+       [SIOCGIWSPY   -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getspy,
+       [SIOCSIWAP    -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setwap,
+       [SIOCGIWAP    -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getwap,
+       [SIOCSIWSCAN  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setscan,
+       [SIOCGIWSCAN  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getscan,
+       [SIOCSIWESSID -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setessid,
+       [SIOCGIWESSID -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getessid,
+       [SIOCSIWNICKN -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setnick,
+       [SIOCGIWNICKN -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getnick,
+       [SIOCSIWRATE  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setrate,
+       [SIOCGIWRATE  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getrate,
+       [SIOCSIWRTS   -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setrts,
+       [SIOCGIWRTS   -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getrts,
+       [SIOCSIWFRAG  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setfrag,
+       [SIOCGIWFRAG  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getfrag,
+       [SIOCGIWRETRY -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getretry,
+       [SIOCSIWENCODE-SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setiwencode,
+       [SIOCGIWENCODE-SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getiwencode,
+       [SIOCSIWPOWER -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setpower,
+       [SIOCGIWPOWER -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getpower,
  };
  
  
@@@ -4360,15 -4359,15 +4360,15 @@@
    Added typecasting since we no longer use iwreq_data -- Moustafa
   */
  static const iw_handler       orinoco_private_handler[] = {
-       [0] (iw_handler) orinoco_ioctl_reset,
-       [1] (iw_handler) orinoco_ioctl_reset,
-       [2] (iw_handler) orinoco_ioctl_setport3,
-       [3] (iw_handler) orinoco_ioctl_getport3,
-       [4] (iw_handler) orinoco_ioctl_setpreamble,
-       [5] (iw_handler) orinoco_ioctl_getpreamble,
-       [6] (iw_handler) orinoco_ioctl_setibssport,
-       [7] (iw_handler) orinoco_ioctl_getibssport,
-       [9] (iw_handler) orinoco_ioctl_getrid,
+       [0] = (iw_handler) orinoco_ioctl_reset,
+       [1] = (iw_handler) orinoco_ioctl_reset,
+       [2] = (iw_handler) orinoco_ioctl_setport3,
+       [3] = (iw_handler) orinoco_ioctl_getport3,
+       [4] = (iw_handler) orinoco_ioctl_setpreamble,
+       [5] = (iw_handler) orinoco_ioctl_getpreamble,
+       [6] = (iw_handler) orinoco_ioctl_setibssport,
+       [7] = (iw_handler) orinoco_ioctl_getibssport,
+       [9] = (iw_handler) orinoco_ioctl_getrid,
  };
  
  static const struct iw_handler_def orinoco_handler_def = {

diff --combined net/Kconfig
index 32327d0,c07aafb..2bdd562
--- 1/net/Kconfig
--- 2/net/Kconfig
+++ b/net/Kconfig
@@@ -147,6 -147,7 +147,7 @@@ source "net/bridge/netfilter/Kconfig
  
  endif
  
+ source "net/dccp/Kconfig"
  source "net/sctp/Kconfig"
  source "net/atm/Kconfig"
  source "net/bridge/Kconfig"
@@@ -205,6 -206,8 +206,8 @@@ config NET_PKTGE
          To compile this code as a module, choose M here: the
          module will be called pktgen.
  
+ source "net/netfilter/Kconfig"
+ 
  endmenu
  
  endmenu
@@@ -212,7 -215,6 +215,7 @@@
  source "net/ax25/Kconfig"
  source "net/irda/Kconfig"
  source "net/bluetooth/Kconfig"
 +source "net/ieee80211/Kconfig"
  
  endif   # if NET
  endmenu # Networking

diff --combined net/Makefile
index 83bc52d,7e6eff2..4aa2f46
--- 1/net/Makefile
--- 2/net/Makefile
+++ b/net/Makefile
@@@ -16,6 -16,7 +16,7 @@@ obj-$(CONFIG_NET)             += $(tmp-y
  obj-$(CONFIG_LLC)             += llc/
  obj-$(CONFIG_NET)             += ethernet/ 802/ sched/ netlink/
  obj-$(CONFIG_INET)            += ipv4/
+ obj-$(CONFIG_NETFILTER)               += netfilter/
  obj-$(CONFIG_XFRM)            += xfrm/
  obj-$(CONFIG_UNIX)            += unix/
  ifneq ($(CONFIG_IPV6),)
@@@ -41,8 -42,8 +42,9 @@@ obj-$(CONFIG_ATM)             += atm
  obj-$(CONFIG_DECNET)          += decnet/
  obj-$(CONFIG_ECONET)          += econet/
  obj-$(CONFIG_VLAN_8021Q)      += 8021q/
+ obj-$(CONFIG_IP_DCCP)         += dccp/
  obj-$(CONFIG_IP_SCTP)         += sctp/
 +obj-$(CONFIG_IEEE80211)               += ieee80211/
  
  ifeq ($(CONFIG_NET),y)
  obj-$(CONFIG_SYSCTL)          += sysctl_net.o