Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/usb/input/Makefile
	drivers/usb/input/gtco.c

1 files changed, 10 insertions, 6 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 1a528548cd1d..ac0c92b1e002 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -42,6 +42,8 @@
 struct vlan_group;
 struct ethtool_ops;
 struct netpoll_info;
+/* 802.11 specific */
+struct wireless_dev;
                                         /* source back-compat hooks */
 #define SET_ETHTOOL_OPS(netdev,ops) \
         ( (netdev)->ethtool_ops = (ops) )
@@ -347,13 +349,15 @@ struct net_device
 
 
         struct net_device_stats* (*get_stats)(struct net_device *dev);
+        struct net_device_stats stats;
 
+#ifdef CONFIG_WIRELESS_EXT
         /* List of functions to handle Wireless Extensions (instead of ioctl).
          * See <net/iw_handler.h> for details. Jean II */
         const struct iw_handler_def *   wireless_handlers;
         /* Instance data managed by the core of Wireless Extensions. */
         struct iw_public_data * wireless_data;
-
+#endif
         const struct ethtool_ops *ethtool_ops;
 
         /*
@@ -398,6 +402,8 @@ struct net_device
         void                    *ip6_ptr;       /* IPv6 specific data */
         void                    *ec_ptr;        /* Econet specific data */
         void                    *ax25_ptr;      /* AX.25 specific data */
+        struct wireless_dev     *ieee80211_ptr; /* IEEE 802.11 specific data,
+                                                   assign before registering */
 
 /*
  * Cache line mostly used on receive path (including eth_type_trans())
@@ -647,8 +653,10 @@ static inline void netif_start_queue(struct net_device *dev)
 static inline void netif_wake_queue(struct net_device *dev)
 {
 #ifdef CONFIG_NETPOLL_TRAP
-        if (netpoll_trap())
+        if (netpoll_trap()) {
+                clear_bit(__LINK_STATE_XOFF, &dev->state);
                 return;
+        }
 #endif
         if (test_and_clear_bit(__LINK_STATE_XOFF, &dev->state))
                 __netif_schedule(dev);
@@ -656,10 +664,6 @@ static inline void netif_wake_queue(struct net_device *dev)
 
 static inline void netif_stop_queue(struct net_device *dev)
 {
-#ifdef CONFIG_NETPOLL_TRAP
-        if (netpoll_trap())
-                return;
-#endif
         set_bit(__LINK_STATE_XOFF, &dev->state);
 }