aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/mac80211.h
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 /include/net/mac80211.h
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 'include/net/mac80211.h')
-rw-r--r--include/net/mac80211.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 58d719ddaa60..b36e60d4c518 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -505,8 +505,6 @@ struct ieee80211_bss_conf {
505 * @IEEE80211_TX_CTL_DONTFRAG: Don't fragment this packet even if it 505 * @IEEE80211_TX_CTL_DONTFRAG: Don't fragment this packet even if it
506 * would be fragmented by size (this is optional, only used for 506 * would be fragmented by size (this is optional, only used for
507 * monitor injection). 507 * monitor injection).
508 * @IEEE80211_TX_CTL_PS_RESPONSE: This frame is a response to a poll
509 * frame (PS-Poll or uAPSD).
510 * 508 *
511 * Note: If you have to add new flags to the enumeration, then don't 509 * Note: If you have to add new flags to the enumeration, then don't
512 * forget to update %IEEE80211_TX_TEMPORARY_FLAGS when necessary. 510 * forget to update %IEEE80211_TX_TEMPORARY_FLAGS when necessary.
@@ -542,7 +540,6 @@ enum mac80211_tx_info_flags {
542 IEEE80211_TX_STATUS_EOSP = BIT(28), 540 IEEE80211_TX_STATUS_EOSP = BIT(28),
543 IEEE80211_TX_CTL_USE_MINRATE = BIT(29), 541 IEEE80211_TX_CTL_USE_MINRATE = BIT(29),
544 IEEE80211_TX_CTL_DONTFRAG = BIT(30), 542 IEEE80211_TX_CTL_DONTFRAG = BIT(30),
545 IEEE80211_TX_CTL_PS_RESPONSE = BIT(31),
546}; 543};
547 544
548#define IEEE80211_TX_CTL_STBC_SHIFT 23 545#define IEEE80211_TX_CTL_STBC_SHIFT 23
@@ -552,11 +549,14 @@ enum mac80211_tx_info_flags {
552 * 549 *
553 * @IEEE80211_TX_CTRL_PORT_CTRL_PROTO: this frame is a port control 550 * @IEEE80211_TX_CTRL_PORT_CTRL_PROTO: this frame is a port control
554 * protocol frame (e.g. EAP) 551 * protocol frame (e.g. EAP)
552 * @IEEE80211_TX_CTRL_PS_RESPONSE: This frame is a response to a poll
553 * frame (PS-Poll or uAPSD).
555 * 554 *
556 * These flags are used in tx_info->control.flags. 555 * These flags are used in tx_info->control.flags.
557 */ 556 */
558enum mac80211_tx_control_flags { 557enum mac80211_tx_control_flags {
559 IEEE80211_TX_CTRL_PORT_CTRL_PROTO = BIT(0), 558 IEEE80211_TX_CTRL_PORT_CTRL_PROTO = BIT(0),
559 IEEE80211_TX_CTRL_PS_RESPONSE = BIT(1),
560}; 560};
561 561
562/* 562/*