aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSujith Manoharan <c_manoha@qca.qualcomm.com>2014-12-10 10:56:10 -0500
committerJohannes Berg <johannes.berg@intel.com>2014-12-12 07:48:26 -0500
commit6b127c71fbdd3daacfd8b9f80b8e6ebfb70a889e (patch)
tree6773467e453784fc5d1c1b5b21ab656368b910c7 /net
parentba1debdfed974f25aa598c283567878657b292ee (diff)
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.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index a42f5b2b024d..db8b07ac6b10 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,
1243 * ends the poll/service period. 1243 * ends the poll/service period.
1244 */ 1244 */
1245 info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER | 1245 info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER |
1246 IEEE80211_TX_CTL_PS_RESPONSE |
1247 IEEE80211_TX_STATUS_EOSP | 1246 IEEE80211_TX_STATUS_EOSP |
1248 IEEE80211_TX_CTL_REQ_TX_STATUS; 1247 IEEE80211_TX_CTL_REQ_TX_STATUS;
1249 1248
1249 info->control.flags |= IEEE80211_TX_CTRL_PS_RESPONSE;
1250
1250 if (call_driver) 1251 if (call_driver)
1251 drv_allow_buffered_frames(local, sta, BIT(tid), 1, 1252 drv_allow_buffered_frames(local, sta, BIT(tid), 1,
1252 reason, false); 1253 reason, false);
@@ -1395,8 +1396,8 @@ ieee80211_sta_ps_deliver_response(struct sta_info *sta,
1395 * STA may still remain is PS mode after this frame 1396 * STA may still remain is PS mode after this frame
1396 * exchange. 1397 * exchange.
1397 */ 1398 */
1398 info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER | 1399 info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
1399 IEEE80211_TX_CTL_PS_RESPONSE; 1400 info->control.flags |= IEEE80211_TX_CTRL_PS_RESPONSE;
1400 1401
1401 /* 1402 /*
1402 * Use MoreData flag to indicate whether there are 1403 * Use MoreData flag to indicate whether there are