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, 6 insertions, 78 deletions

diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
index b85c4f27b361..a2fbe0131312 100644
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
@@ -39,13 +39,6 @@ static const struct file_operations sta_ ##name## _ops = {		\
         .open = mac80211_open_file_generic,                             \
 }
 
-#define STA_OPS_WR(name)                                                \
-static const struct file_operations sta_ ##name## _ops = {              \
-        .read = sta_##name##_read,                                      \
-        .write = sta_##name##_write,                                    \
-        .open = mac80211_open_file_generic,                             \
-}
-
 #define STA_FILE(name, field, format)                                   \
                 STA_READ_##format(name, field)                          \
                 STA_OPS(name)
@@ -144,7 +137,7 @@ static ssize_t sta_agg_status_read(struct file *file, char __user *userbuf,
         p += scnprintf(p, sizeof(buf)+buf-p, "\n DTKN:");
         for (i = 0; i < STA_TID_NUM; i++)
                 p += scnprintf(p, sizeof(buf)+buf-p, "%5d",
-                        sta->ampdu_mlme.tid_state_rx[i]?
+                        sta->ampdu_mlme.tid_state_rx[i] ?
                         sta->ampdu_mlme.tid_rx[i]->dialog_token : 0);
 
         p += scnprintf(p, sizeof(buf)+buf-p, "\n TX  :");
@@ -155,84 +148,20 @@ static ssize_t sta_agg_status_read(struct file *file, char __user *userbuf,
         p += scnprintf(p, sizeof(buf)+buf-p, "\n DTKN:");
         for (i = 0; i < STA_TID_NUM; i++)
                 p += scnprintf(p, sizeof(buf)+buf-p, "%5d",
-                        sta->ampdu_mlme.tid_state_tx[i]?
+                        sta->ampdu_mlme.tid_state_tx[i] ?
                         sta->ampdu_mlme.tid_tx[i]->dialog_token : 0);
 
         p += scnprintf(p, sizeof(buf)+buf-p, "\n SSN :");
         for (i = 0; i < STA_TID_NUM; i++)
                 p += scnprintf(p, sizeof(buf)+buf-p, "%5d",
-                        sta->ampdu_mlme.tid_state_tx[i]?
+                        sta->ampdu_mlme.tid_state_tx[i] ?
                         sta->ampdu_mlme.tid_tx[i]->ssn : 0);
 
         p += scnprintf(p, sizeof(buf)+buf-p, "\n");
 
         return simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);
 }
-
-static ssize_t sta_agg_status_write(struct file *file,
-                const char __user *user_buf, size_t count, loff_t *ppos)
-{
-        struct sta_info *sta = file->private_data;
-        struct ieee80211_local *local = sta->sdata->local;
-        struct ieee80211_hw *hw = &local->hw;
-        u8 *da = sta->sta.addr;
-        static int tid_static_tx[16] = {0, 0, 0, 0, 0, 0, 0, 0,
-                                        0, 0, 0, 0, 0, 0, 0, 0};
-        static int tid_static_rx[16] = {1, 1, 1, 1, 1, 1, 1, 1,
-                                        1, 1, 1, 1, 1, 1, 1, 1};
-        char *endp;
-        char buf[32];
-        int buf_size, rs;
-        unsigned int tid_num;
-        char state[4];
-
-        memset(buf, 0x00, sizeof(buf));
-        buf_size = min(count, (sizeof(buf)-1));
-        if (copy_from_user(buf, user_buf, buf_size))
-                return -EFAULT;
-
-        tid_num = simple_strtoul(buf, &endp, 0);
-        if (endp == buf)
-                return -EINVAL;
-
-        if ((tid_num >= 100) && (tid_num <= 115)) {
-                /* toggle Rx aggregation command */
-                tid_num = tid_num - 100;
-                if (tid_static_rx[tid_num] == 1) {
-                        strcpy(state, "off");
-                        ieee80211_sta_stop_rx_ba_session(sta->sdata, da, tid_num, 0,
-                                        WLAN_REASON_QSTA_REQUIRE_SETUP);
-                        sta->ampdu_mlme.tid_state_rx[tid_num] |=
-                                        HT_AGG_STATE_DEBUGFS_CTL;
-                        tid_static_rx[tid_num] = 0;
-                } else {
-                        strcpy(state, "on ");
-                        sta->ampdu_mlme.tid_state_rx[tid_num] &=
-                                        ~HT_AGG_STATE_DEBUGFS_CTL;
-                        tid_static_rx[tid_num] = 1;
-                }
-                printk(KERN_DEBUG "debugfs - try switching tid %u %s\n",
-                                tid_num, state);
-        } else if ((tid_num >= 0) && (tid_num <= 15)) {
-                /* toggle Tx aggregation command */
-                if (tid_static_tx[tid_num] == 0) {
-                        strcpy(state, "on ");
-                        rs =  ieee80211_start_tx_ba_session(hw, da, tid_num);
-                        if (rs == 0)
-                                tid_static_tx[tid_num] = 1;
-                } else {
-                        strcpy(state, "off");
-                        rs =  ieee80211_stop_tx_ba_session(hw, da, tid_num, 1);
-                        if (rs == 0)
-                                tid_static_tx[tid_num] = 0;
-                }
-                printk(KERN_DEBUG "debugfs - switching tid %u %s, return=%d\n",
-                                tid_num, state, rs);
-        }
-
-        return count;
-}
-STA_OPS_WR(agg_status);
+STA_OPS(agg_status);
 
 #define DEBUGFS_ADD(name) \
         sta->debugfs.name = debugfs_create_file(#name, 0400, \
@@ -246,15 +175,14 @@ STA_OPS_WR(agg_status);
 void ieee80211_sta_debugfs_add(struct sta_info *sta)
 {
         struct dentry *stations_dir = sta->local->debugfs.stations;
-        DECLARE_MAC_BUF(mbuf);
-        u8 *mac;
+        u8 mac[3*ETH_ALEN];
 
         sta->debugfs.add_has_run = true;
 
         if (!stations_dir)
                 return;
 
-        mac = print_mac(mbuf, sta->sta.addr);
+        snprintf(mac, sizeof(mac), "%pM", sta->sta.addr);
 
         /*
          * This might fail due to a race condition: