diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-13 00:12:31 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-13 00:12:31 (GMT) |
| commit | 816a7854d56f19aeba3c83e1ed8c2c0ef275365a (patch) | |
| tree | c3b82ad98006fc5fa7b408c142e75a6053195dfa /drivers/net/wireless/wl12xx | |
| parent | 011e3c63251be832d23df9f0697626ab7b354d02 (diff) | |
| parent | 7eab0f64a9eba5405222fdef0ede2468bf495efd (diff) | |
| download | linux-fsl-qoriq-816a7854d56f19aeba3c83e1ed8c2c0ef275365a.tar.xz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'drivers/net/wireless/wl12xx')
| -rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 3900236..362ff1a 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c @@ -232,7 +232,7 @@ static struct conf_drv_settings default_conf = { .rule = CONF_BCN_RULE_PASS_ON_APPEARANCE, }, [1] = { - .ie = WLAN_EID_HT_INFORMATION, + .ie = WLAN_EID_HT_OPERATION, .rule = CONF_BCN_RULE_PASS_ON_CHANGE, }, }, @@ -5242,7 +5242,8 @@ static int wl1271_init_ieee80211(struct wl1271 *wl) wl->hw->wiphy->max_sched_scan_ie_len = WL1271_CMD_TEMPL_MAX_SIZE - sizeof(struct ieee80211_header); - wl->hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD; + wl->hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD | + WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL; /* make sure all our channels fit in the scanned_ch bitmask */ BUILD_BUG_ON(ARRAY_SIZE(wl1271_channels) + |