mwl8k: Send BASTREAM firmware commands per vif

The firmware supports 8 macid's corresponding to 8 BSS that can be
created in an MBSS environment. Currently, BASTREAM commands were always
sent with macid 0. This macid is used to configure the hardware ampdu
registers with appropriate BSS address in an MBSS environment.
This mac address is used by the hardware for various ampdu related requirements
e.g. source address in BAR generation, BA interpretation e.t.c.
Using invalid macid results in this mac address not getting appropriately
configured in the hardware which results in issues during ampdu traffic.

Fix this by sending the BASTREAM commands with appropriate macid.

Signed-off-by: Nishant Sarmukadam <nishants@marvell.com>
Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 3db495090e55d6025c1c61aa961868e20deab8ea..0cdae663273554c91ecab874ed1d46d728d8d533 100644 (file)
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -3686,7 +3686,8 @@ struct mwl8k_cmd_bastream {
 } __packed;
 
 static int
-mwl8k_check_ba(struct ieee80211_hw *hw, struct mwl8k_ampdu_stream *stream)
+mwl8k_check_ba(struct ieee80211_hw *hw, struct mwl8k_ampdu_stream *stream,
+              struct ieee80211_vif *vif)
 {
        struct mwl8k_cmd_bastream *cmd;
        int rc;
@@ -3709,7 +3710,7 @@ mwl8k_check_ba(struct ieee80211_hw *hw, struct mwl8k_ampdu_stream *stream)
                cpu_to_le32(BASTREAM_FLAG_IMMEDIATE_TYPE) |
                cpu_to_le32(BASTREAM_FLAG_DIRECTION_UPSTREAM);
 
-       rc = mwl8k_post_cmd(hw, &cmd->header);
+       rc = mwl8k_post_pervif_cmd(hw, vif, &cmd->header);
 
        kfree(cmd);
 
@@ -3718,7 +3719,7 @@ mwl8k_check_ba(struct ieee80211_hw *hw, struct mwl8k_ampdu_stream *stream)
 
 static int
 mwl8k_create_ba(struct ieee80211_hw *hw, struct mwl8k_ampdu_stream *stream,
-               u8 buf_size)
+               u8 buf_size, struct ieee80211_vif *vif)
 {
        struct mwl8k_cmd_bastream *cmd;
        int rc;
@@ -3752,7 +3753,7 @@ mwl8k_create_ba(struct ieee80211_hw *hw, struct mwl8k_ampdu_stream *stream,
                cpu_to_le32(BASTREAM_FLAG_IMMEDIATE_TYPE |
                                        BASTREAM_FLAG_DIRECTION_UPSTREAM);
 
-       rc = mwl8k_post_cmd(hw, &cmd->header);
+       rc = mwl8k_post_pervif_cmd(hw, vif, &cmd->header);
 
        wiphy_debug(hw->wiphy, "Created a BA stream for %pM : tid %d\n",
                stream->sta->addr, stream->tid);
@@ -5144,7 +5145,7 @@ mwl8k_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                                return -EBUSY;
                        }
 
-                       rc = mwl8k_check_ba(hw, stream);
+                       rc = mwl8k_check_ba(hw, stream, vif);
 
                        /* If HW restart is in progress mwl8k_post_cmd will
                         * return -EBUSY. Avoid retrying mwl8k_check_ba in
@@ -5184,7 +5185,7 @@ mwl8k_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                BUG_ON(stream == NULL);
                BUG_ON(stream->state != AMPDU_STREAM_IN_PROGRESS);
                spin_unlock(&priv->stream_lock);
-               rc = mwl8k_create_ba(hw, stream, buf_size);
+               rc = mwl8k_create_ba(hw, stream, buf_size, vif);
                spin_lock(&priv->stream_lock);
                if (!rc)
                        stream->state = AMPDU_STREAM_ACTIVE;