diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-04-15 16:21:34 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-04-15 16:21:34 -0400 |
commit | 5c01d5669356e13f0fb468944c1dd4c6a7e978ad (patch) | |
tree | fa43345288d7b25fac92b3b35360a177c4947313 /include/net/mac80211.h | |
parent | fea069152614cdeefba4b2bf80afcddb9c217fc8 (diff) | |
parent | a5e944f1d955f3819503348426763e21e0413ba6 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/wl12xx/wl1271_main.c
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r-- | include/net/mac80211.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 20823d04e03c..344e5bf72062 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -587,11 +587,15 @@ struct ieee80211_rx_status { | |||
587 | * may turn the device off as much as possible. Typically, this flag will | 587 | * may turn the device off as much as possible. Typically, this flag will |
588 | * be set when an interface is set UP but not associated or scanning, but | 588 | * be set when an interface is set UP but not associated or scanning, but |
589 | * it can also be unset in that case when monitor interfaces are active. | 589 | * it can also be unset in that case when monitor interfaces are active. |
590 | * @IEEE80211_CONF_QOS: Enable 802.11e QoS also know as WMM (Wireless | ||
591 | * Multimedia). On some drivers (iwlwifi is one of know) we have | ||
592 | * to enable/disable QoS explicitly. | ||
590 | */ | 593 | */ |
591 | enum ieee80211_conf_flags { | 594 | enum ieee80211_conf_flags { |
592 | IEEE80211_CONF_MONITOR = (1<<0), | 595 | IEEE80211_CONF_MONITOR = (1<<0), |
593 | IEEE80211_CONF_PS = (1<<1), | 596 | IEEE80211_CONF_PS = (1<<1), |
594 | IEEE80211_CONF_IDLE = (1<<2), | 597 | IEEE80211_CONF_IDLE = (1<<2), |
598 | IEEE80211_CONF_QOS = (1<<3), | ||
595 | }; | 599 | }; |
596 | 600 | ||
597 | 601 | ||
@@ -616,6 +620,7 @@ enum ieee80211_conf_changed { | |||
616 | IEEE80211_CONF_CHANGE_CHANNEL = BIT(6), | 620 | IEEE80211_CONF_CHANGE_CHANNEL = BIT(6), |
617 | IEEE80211_CONF_CHANGE_RETRY_LIMITS = BIT(7), | 621 | IEEE80211_CONF_CHANGE_RETRY_LIMITS = BIT(7), |
618 | IEEE80211_CONF_CHANGE_IDLE = BIT(8), | 622 | IEEE80211_CONF_CHANGE_IDLE = BIT(8), |
623 | IEEE80211_CONF_CHANGE_QOS = BIT(9), | ||
619 | }; | 624 | }; |
620 | 625 | ||
621 | /** | 626 | /** |
@@ -1822,7 +1827,10 @@ void ieee80211_restart_hw(struct ieee80211_hw *hw); | |||
1822 | * ieee80211_rx - receive frame | 1827 | * ieee80211_rx - receive frame |
1823 | * | 1828 | * |
1824 | * Use this function to hand received frames to mac80211. The receive | 1829 | * Use this function to hand received frames to mac80211. The receive |
1825 | * buffer in @skb must start with an IEEE 802.11 header. | 1830 | * buffer in @skb must start with an IEEE 802.11 header. In case of a |
1831 | * paged @skb is used, the driver is recommended to put the ieee80211 | ||
1832 | * header of the frame on the linear part of the @skb to avoid memory | ||
1833 | * allocation and/or memcpy by the stack. | ||
1826 | * | 1834 | * |
1827 | * This function may not be called in IRQ context. Calls to this function | 1835 | * This function may not be called in IRQ context. Calls to this function |
1828 | * for a single hardware must be synchronized against each other. Calls to | 1836 | * for a single hardware must be synchronized against each other. Calls to |