mac80211: fill start-sequence-number for BA session start
authorJohannes Berg <johannes@sipsolutions.net>
Wed, 6 Aug 2008 19:45:26 +0000 (21:45 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 29 Aug 2008 20:23:55 +0000 (16:23 -0400)
Otherwise, drivers are required to keep track of the sequence numbers
themselves, and they really shouldn't be since we already do it for
them. I'll fix the race once we figure out how this code should work
at all, it's currently disabled.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/main.c

index 398ca66bdfcb3dacce7a28b2fb12b97a969be0e0..638b75f36e23aa8f4462744b1f48afc6e06249dd 100644 (file)
@@ -598,7 +598,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_hw *hw, u8 *ra, u16 tid)
        struct ieee80211_local *local = hw_to_local(hw);
        struct sta_info *sta;
        struct ieee80211_sub_if_data *sdata;
-       u16 start_seq_num = 0;
+       u16 start_seq_num;
        u8 *state;
        int ret;
        DECLARE_MAC_BUF(mac);
@@ -678,6 +678,9 @@ int ieee80211_start_tx_ba_session(struct ieee80211_hw *hw, u8 *ra, u16 tid)
         * call back right away, it must see that the flow has begun */
        *state |= HT_ADDBA_REQUESTED_MSK;
 
+       /* This is slightly racy because the queue isn't stopped */
+       start_seq_num = sta->tid_seq[tid];
+
        if (local->ops->ampdu_action)
                ret = local->ops->ampdu_action(hw, IEEE80211_AMPDU_TX_START,
                                                ra, tid, &start_seq_num);