diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-01-13 14:40:59 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-01-13 14:40:59 -0500 |
| commit | f13352519ee8c4b22b87fc1a47743d1f53ea193e (patch) | |
| tree | 48c18144f3e5e530ec61d5eadbb5a34675a69fe8 /drivers/net/wireless/cw1200 | |
| parent | 559c33d84da71e07816e692bfd73ad92675256a6 (diff) | |
| parent | 26b0e411d37a2ca5992d02884dc3fa4e1907e598 (diff) | |
| download | blackbird-op-linux-f13352519ee8c4b22b87fc1a47743d1f53ea193e.tar.gz blackbird-op-linux-f13352519ee8c4b22b87fc1a47743d1f53ea193e.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/cw1200')
| -rw-r--r-- | drivers/net/wireless/cw1200/main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/cw1200/main.c b/drivers/net/wireless/cw1200/main.c index d1270da4dfea..3e78cc3ccb78 100644 --- a/drivers/net/wireless/cw1200/main.c +++ b/drivers/net/wireless/cw1200/main.c @@ -301,7 +301,6 @@ static struct ieee80211_hw *cw1200_init_common(const u8 *macaddr, hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD; - hw->channel_change_time = 1000; /* TODO: find actual value */ hw->queues = 4; priv->rts_threshold = -1; |
