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

diff --combined drivers/usb/net/zd1201.c
index 72b06129e20a84e7ae8ddb926efb9d8a9e86e9a3,29cd801eb958461592a5359cc7c06f0fd181138c..2a1d489e92c024793f9437a0a8ac0d3538af9950
--- 1/drivers/usb/net/zd1201.c
--- 2/drivers/usb/net/zd1201.c
+++ b/drivers/usb/net/zd1201.c
@@@ -21,7 -21,7 +21,7 @@@
  #include <linux/string.h>
  #include <linux/if_arp.h>
  #include <linux/firmware.h>
 -#include <ieee802_11.h>
 +#include <net/ieee80211.h>
  #include "zd1201.h"
  
  static struct usb_device_id zd1201_table[] = {
@@@ -29,6 -29,7 +29,7 @@@
        {USB_DEVICE(0x0ace, 0x1201)}, /* ZyDAS ZD1201 Wireless USB Adapter */
        {USB_DEVICE(0x050d, 0x6051)}, /* Belkin F5D6051 usb  adapter */
        {USB_DEVICE(0x0db0, 0x6823)}, /* MSI UB11B usb  adapter */
+       {USB_DEVICE(0x1044, 0x8005)}, /* GIGABYTE GN-WLBZ201 usb adapter */
        {}
  };
  
@@@ -337,25 -338,25 +338,25 @@@ static void zd1201_usbrx(struct urb *ur
                        goto resubmit;
                }
                        
 -              if ((seq & IEEE802_11_SCTL_FRAG) ||
 -                  (fc & IEEE802_11_FCTL_MOREFRAGS)) {
 +              if ((seq & IEEE80211_SCTL_FRAG) ||
 +                  (fc & IEEE80211_FCTL_MOREFRAGS)) {
                        struct zd1201_frag *frag = NULL;
                        char *ptr;
  
                        if (datalen<14)
                                goto resubmit;
 -                      if ((seq & IEEE802_11_SCTL_FRAG) == 0) {
 +                      if ((seq & IEEE80211_SCTL_FRAG) == 0) {
                                frag = kmalloc(sizeof(struct zd1201_frag*),
                                    GFP_ATOMIC);
                                if (!frag)
                                        goto resubmit;
 -                              skb = dev_alloc_skb(IEEE802_11_DATA_LEN +14+2);
 +                              skb = dev_alloc_skb(IEEE80211_DATA_LEN +14+2);
                                if (!skb) {
                                        kfree(frag);
                                        goto resubmit;
                                }
                                frag->skb = skb;
 -                              frag->seq = seq & IEEE802_11_SCTL_SEQ;
 +                              frag->seq = seq & IEEE80211_SCTL_SEQ;
                                skb_reserve(skb, 2);
                                memcpy(skb_put(skb, 12), &data[datalen-14], 12);
                                memcpy(skb_put(skb, 2), &data[6], 2);
@@@ -364,7 -365,7 +365,7 @@@
                                goto resubmit;
                        }
                        hlist_for_each_entry(frag, node, &zd->fraglist, fnode)
 -                              if(frag->seq == (seq&IEEE802_11_SCTL_SEQ))
 +                              if(frag->seq == (seq&IEEE80211_SCTL_SEQ))
                                        break;
                        if (!frag)
                                goto resubmit;
@@@ -372,7 -373,7 +373,7 @@@
                        ptr = skb_put(skb, len);
                        if (ptr)
                                memcpy(ptr, data+8, len);
 -                      if (fc & IEEE802_11_FCTL_MOREFRAGS)
 +                      if (fc & IEEE80211_FCTL_MOREFRAGS)
                                goto resubmit;
                        hlist_del_init(&frag->fnode);
                        kfree(frag);

diff --combined net/Kconfig
index 3ae4a47e60aeaab448bdca858174aba1f50ec792,40a31ba86d2c9b689d4e59152539e4e4f10930db..32327d0a56ad0c9c9a52094cc05d072d5524fd18
--- 1/net/Kconfig
--- 2/net/Kconfig
+++ b/net/Kconfig
@@@ -209,26 -209,9 +209,10 @@@ endmen
  
  endmenu
  
- config NETPOLL
-       def_bool NETCONSOLE
- 
- config NETPOLL_RX
-       bool "Netpoll support for trapping incoming packets"
-       default n
-       depends on NETPOLL
- 
- config NETPOLL_TRAP
-       bool "Netpoll traffic trapping"
-       default n
-       depends on NETPOLL
- 
- config NET_POLL_CONTROLLER
-       def_bool NETPOLL
- 
  source "net/ax25/Kconfig"
  source "net/irda/Kconfig"
  source "net/bluetooth/Kconfig"
 +source "net/ieee80211/Kconfig"
  
  endif   # if NET
  endmenu # Networking