diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-10 23:41:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-10 23:41:43 -0700 |
| commit | 84503ddd65e804ccdeedee3f307b40d80ff793e6 (patch) | |
| tree | c7b805f441b1d8cb2e86b8411cf2302ff46186b4 /include/net | |
| parent | 51611a120e8120290152edd7d0020d22a7f4b4a3 (diff) | |
| parent | 2f0accc13520b2644b85f80aedce10d10d88b0ca (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/mac80211.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 17d61d19d91..c0610447697 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -239,6 +239,8 @@ struct ieee80211_bss_conf { * @IEEE80211_TX_INTFL_NEED_TXPROCESSING: completely internal to mac80211, * used to indicate that a pending frame requires TX processing before * it can be sent out. + * @IEEE80211_TX_INTFL_RETRIED: completely internal to mac80211, + * used to indicate that a frame was already retried due to PS */ enum mac80211_tx_control_flags { IEEE80211_TX_CTL_REQ_TX_STATUS = BIT(0), @@ -256,6 +258,7 @@ enum mac80211_tx_control_flags { IEEE80211_TX_CTL_RATE_CTRL_PROBE = BIT(12), IEEE80211_TX_INTFL_RCALGO = BIT(13), IEEE80211_TX_INTFL_NEED_TXPROCESSING = BIT(14), + IEEE80211_TX_INTFL_RETRIED = BIT(15), }; /** |