diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-11-11 12:48:42 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-12-15 12:34:45 +0100 |
| commit | 848955ccf0bdf42fff33e021a76f6daec98fe59b (patch) | |
| tree | f4d17dc5c3f732ad016152ba509b4bc681526ec2 /drivers/net/wireless/cw1200 | |
| parent | 4bcc56bb3a9622e877772598d1cac124266b2b8a (diff) | |
| download | op-kernel-dev-848955ccf0bdf42fff33e021a76f6daec98fe59b.zip op-kernel-dev-848955ccf0bdf42fff33e021a76f6daec98fe59b.tar.gz | |
mac80211: move U-APSD enablement to vif flags
In order to let drivers have more dynamic U-APSD support,
move the enablement flag to the virtual interface driver
flags. This lets drivers not only set it up differently
for different interfaces, but also enable/disable on the
fly if needed.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/cw1200')
| -rw-r--r-- | drivers/net/wireless/cw1200/main.c | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/cw1200/sta.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/cw1200/main.c b/drivers/net/wireless/cw1200/main.c index 3e78cc3..0da6e42 100644 --- a/drivers/net/wireless/cw1200/main.c +++ b/drivers/net/wireless/cw1200/main.c @@ -282,7 +282,6 @@ static struct ieee80211_hw *cw1200_init_common(const u8 *macaddr, IEEE80211_HW_SUPPORTS_PS | IEEE80211_HW_SUPPORTS_DYNAMIC_PS | IEEE80211_HW_REPORTS_TX_ACK_STATUS | - IEEE80211_HW_SUPPORTS_UAPSD | IEEE80211_HW_CONNECTION_MONITOR | IEEE80211_HW_AMPDU_AGGREGATION | IEEE80211_HW_TX_AMPDU_SETUP_IN_HW | diff --git a/drivers/net/wireless/cw1200/sta.c b/drivers/net/wireless/cw1200/sta.c index 5b84664..a1e3237 100644 --- a/drivers/net/wireless/cw1200/sta.c +++ b/drivers/net/wireless/cw1200/sta.c @@ -213,6 +213,7 @@ int cw1200_add_interface(struct ieee80211_hw *dev, /* __le32 auto_calibration_mode = __cpu_to_le32(1); */ vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER | + IEEE80211_VIF_SUPPORTS_UAPSD | IEEE80211_VIF_SUPPORTS_CQM_RSSI; mutex_lock(&priv->conf_mutex); |
