diff options
| author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2014-12-10 21:26:10 +0530 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-12-12 13:48:26 +0100 |
| commit | 6b127c71fbdd3daacfd8b9f80b8e6ebfb70a889e (patch) | |
| tree | 6773467e453784fc5d1c1b5b21ab656368b910c7 /net | |
| parent | ba1debdfed974f25aa598c283567878657b292ee (diff) | |
| download | op-kernel-dev-6b127c71fbdd3daacfd8b9f80b8e6ebfb70a889e.zip op-kernel-dev-6b127c71fbdd3daacfd8b9f80b8e6ebfb70a889e.tar.gz | |
mac80211: Move IEEE80211_TX_CTL_PS_RESPONSE
Move IEEE80211_TX_CTL_PS_RESPONSE to info->control.flags since
this is used only in the TX path (by ath9k). This frees up
a bit which can be used for other purposes.
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/sta_info.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index a42f5b2..db8b07a 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -1243,10 +1243,11 @@ static void ieee80211_send_null_response(struct ieee80211_sub_if_data *sdata, * ends the poll/service period. */ info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER | - IEEE80211_TX_CTL_PS_RESPONSE | IEEE80211_TX_STATUS_EOSP | IEEE80211_TX_CTL_REQ_TX_STATUS; + info->control.flags |= IEEE80211_TX_CTRL_PS_RESPONSE; + if (call_driver) drv_allow_buffered_frames(local, sta, BIT(tid), 1, reason, false); @@ -1395,8 +1396,8 @@ ieee80211_sta_ps_deliver_response(struct sta_info *sta, * STA may still remain is PS mode after this frame * exchange. */ - info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER | - IEEE80211_TX_CTL_PS_RESPONSE; + info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER; + info->control.flags |= IEEE80211_TX_CTRL_PS_RESPONSE; /* * Use MoreData flag to indicate whether there are |
