Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
  net: Allow dependancies of FDDI & Tokenring to be modular.
  igb: Fix build warning when DCA is disabled.
  net: Fix warning fallout from recent NAPI interface changes.
  gro: Fix potential use after free
  sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
  sfc: When disabling the NIC, close the device rather than unregistering it
  sfc: SFT9001: Add cable diagnostics
  sfc: Add support for multiple PHY self-tests
  sfc: Merge top-level functions for self-tests
  sfc: Clean up PHY mode management in loopback self-test
  sfc: Fix unreliable link detection in some loopback modes
  sfc: Generate unique names for per-NIC workqueues
  802.3ad: use standard ethhdr instead of ad_header
  802.3ad: generalize out mac address initializer
  802.3ad: initialize ports LACPDU from const initializer
  802.3ad: remove typedef around ad_system
  802.3ad: turn ports is_individual into a bool
  802.3ad: turn ports is_enabled into a bool
  802.3ad: make ntt bool
  ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
  ...

Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).

1 files changed, 89 insertions, 18 deletions

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index cee4884b9d06..fb89e1d0aa03 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -239,7 +239,7 @@ __le16 ieee80211_generic_frame_duration(struct ieee80211_hw *hw,
         erp = 0;
         if (vif) {
                 sdata = vif_to_sdata(vif);
-                short_preamble = sdata->bss_conf.use_short_preamble;
+                short_preamble = sdata->vif.bss_conf.use_short_preamble;
                 if (sdata->flags & IEEE80211_SDATA_OPERATING_GMODE)
                         erp = rate->flags & IEEE80211_RATE_ERP_G;
         }
@@ -272,7 +272,7 @@ __le16 ieee80211_rts_duration(struct ieee80211_hw *hw,
         erp = 0;
         if (vif) {
                 sdata = vif_to_sdata(vif);
-                short_preamble = sdata->bss_conf.use_short_preamble;
+                short_preamble = sdata->vif.bss_conf.use_short_preamble;
                 if (sdata->flags & IEEE80211_SDATA_OPERATING_GMODE)
                         erp = rate->flags & IEEE80211_RATE_ERP_G;
         }
@@ -312,7 +312,7 @@ __le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw,
         erp = 0;
         if (vif) {
                 sdata = vif_to_sdata(vif);
-                short_preamble = sdata->bss_conf.use_short_preamble;
+                short_preamble = sdata->vif.bss_conf.use_short_preamble;
                 if (sdata->flags & IEEE80211_SDATA_OPERATING_GMODE)
                         erp = rate->flags & IEEE80211_RATE_ERP_G;
         }
@@ -330,10 +330,20 @@ __le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw,
 }
 EXPORT_SYMBOL(ieee80211_ctstoself_duration);
 
-void ieee80211_wake_queue(struct ieee80211_hw *hw, int queue)
+static void __ieee80211_wake_queue(struct ieee80211_hw *hw, int queue,
+                                   enum queue_stop_reason reason)
 {
         struct ieee80211_local *local = hw_to_local(hw);
 
+        /* we don't need to track ampdu queues */
+        if (queue < ieee80211_num_regular_queues(hw)) {
+                __clear_bit(reason, &local->queue_stop_reasons[queue]);
+
+                if (local->queue_stop_reasons[queue] != 0)
+                        /* someone still has this queue stopped */
+                        return;
+        }
+
         if (test_bit(queue, local->queues_pending)) {
                 set_bit(queue, local->queues_pending_run);
                 tasklet_schedule(&local->tx_pending_tasklet);
@@ -341,22 +351,74 @@ void ieee80211_wake_queue(struct ieee80211_hw *hw, int queue)
                 netif_wake_subqueue(local->mdev, queue);
         }
 }
+
+void ieee80211_wake_queue_by_reason(struct ieee80211_hw *hw, int queue,
+                                    enum queue_stop_reason reason)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+        unsigned long flags;
+
+        spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
+        __ieee80211_wake_queue(hw, queue, reason);
+        spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
+}
+
+void ieee80211_wake_queue(struct ieee80211_hw *hw, int queue)
+{
+        ieee80211_wake_queue_by_reason(hw, queue,
+                                       IEEE80211_QUEUE_STOP_REASON_DRIVER);
+}
 EXPORT_SYMBOL(ieee80211_wake_queue);
 
-void ieee80211_stop_queue(struct ieee80211_hw *hw, int queue)
+static void __ieee80211_stop_queue(struct ieee80211_hw *hw, int queue,
+                                   enum queue_stop_reason reason)
 {
         struct ieee80211_local *local = hw_to_local(hw);
 
+        /* we don't need to track ampdu queues */
+        if (queue < ieee80211_num_regular_queues(hw))
+                __set_bit(reason, &local->queue_stop_reasons[queue]);
+
         netif_stop_subqueue(local->mdev, queue);
 }
+
+void ieee80211_stop_queue_by_reason(struct ieee80211_hw *hw, int queue,
+                                    enum queue_stop_reason reason)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+        unsigned long flags;
+
+        spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
+        __ieee80211_stop_queue(hw, queue, reason);
+        spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
+}
+
+void ieee80211_stop_queue(struct ieee80211_hw *hw, int queue)
+{
+        ieee80211_stop_queue_by_reason(hw, queue,
+                                       IEEE80211_QUEUE_STOP_REASON_DRIVER);
+}
 EXPORT_SYMBOL(ieee80211_stop_queue);
 
-void ieee80211_stop_queues(struct ieee80211_hw *hw)
+void ieee80211_stop_queues_by_reason(struct ieee80211_hw *hw,
+                                    enum queue_stop_reason reason)
 {
+        struct ieee80211_local *local = hw_to_local(hw);
+        unsigned long flags;
         int i;
 
+        spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
+
         for (i = 0; i < ieee80211_num_queues(hw); i++)
-                ieee80211_stop_queue(hw, i);
+                __ieee80211_stop_queue(hw, i, reason);
+
+        spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
+}
+
+void ieee80211_stop_queues(struct ieee80211_hw *hw)
+{
+        ieee80211_stop_queues_by_reason(hw,
+                                        IEEE80211_QUEUE_STOP_REASON_DRIVER);
 }
 EXPORT_SYMBOL(ieee80211_stop_queues);
 
@@ -367,12 +429,24 @@ int ieee80211_queue_stopped(struct ieee80211_hw *hw, int queue)
 }
 EXPORT_SYMBOL(ieee80211_queue_stopped);
 
-void ieee80211_wake_queues(struct ieee80211_hw *hw)
+void ieee80211_wake_queues_by_reason(struct ieee80211_hw *hw,
+                                     enum queue_stop_reason reason)
 {
+        struct ieee80211_local *local = hw_to_local(hw);
+        unsigned long flags;
         int i;
 
+        spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
+
         for (i = 0; i < hw->queues + hw->ampdu_queues; i++)
-                ieee80211_wake_queue(hw, i);
+                __ieee80211_wake_queue(hw, i, reason);
+
+        spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
+}
+
+void ieee80211_wake_queues(struct ieee80211_hw *hw)
+{
+        ieee80211_wake_queues_by_reason(hw, IEEE80211_QUEUE_STOP_REASON_DRIVER);
 }
 EXPORT_SYMBOL(ieee80211_wake_queues);
 
@@ -532,8 +606,8 @@ void ieee802_11_parse_elems(u8 *start, size_t len,
                         if (elen >= sizeof(struct ieee80211_ht_cap))
                                 elems->ht_cap_elem = (void *)pos;
                         break;
-                case WLAN_EID_HT_EXTRA_INFO:
-                        if (elen >= sizeof(struct ieee80211_ht_addt_info))
+                case WLAN_EID_HT_INFORMATION:
+                        if (elen >= sizeof(struct ieee80211_ht_info))
                                 elems->ht_info_elem = (void *)pos;
                         break;
                 case WLAN_EID_MESH_ID:
@@ -638,19 +712,16 @@ int ieee80211_set_freq(struct ieee80211_sub_if_data *sdata, int freqMHz)
 
         if (chan && !(chan->flags & IEEE80211_CHAN_DISABLED)) {
                 if (sdata->vif.type == NL80211_IFTYPE_ADHOC &&
-                    chan->flags & IEEE80211_CHAN_NO_IBSS) {
-                        printk(KERN_DEBUG "%s: IBSS not allowed on frequency "
-                                "%d MHz\n", sdata->dev->name, chan->center_freq);
+                    chan->flags & IEEE80211_CHAN_NO_IBSS)
                         return ret;
-                }
                 local->oper_channel = chan;
+                local->oper_channel_type = NL80211_CHAN_NO_HT;
 
                 if (local->sw_scanning || local->hw_scanning)
                         ret = 0;
                 else
-                        ret = ieee80211_hw_config(local);
-
-                rate_control_clear(local);
+                        ret = ieee80211_hw_config(
+                                local, IEEE80211_CONF_CHANGE_CHANNEL);
         }
 
         return ret;