diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-01-13 23:40:59 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-01-13 23:40:59 +0400 |
| commit | f13352519ee8c4b22b87fc1a47743d1f53ea193e (patch) | |
| tree | 48c18144f3e5e530ec61d5eadbb5a34675a69fe8 /drivers/net/wireless/p54 | |
| parent | 559c33d84da71e07816e692bfd73ad92675256a6 (diff) | |
| parent | 26b0e411d37a2ca5992d02884dc3fa4e1907e598 (diff) | |
| download | linux-f13352519ee8c4b22b87fc1a47743d1f53ea193e.tar.xz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/p54')
| -rw-r--r-- | drivers/net/wireless/p54/main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c index 80d93cba5150..eede90b63f84 100644 --- a/drivers/net/wireless/p54/main.c +++ b/drivers/net/wireless/p54/main.c @@ -756,7 +756,6 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len) BIT(NL80211_IFTYPE_AP) | BIT(NL80211_IFTYPE_MESH_POINT); - dev->channel_change_time = 1000; /* TODO: find actual value */ priv->beacon_req_id = cpu_to_le32(0); priv->tx_stats[P54_QUEUE_BEACON].limit = 1; priv->tx_stats[P54_QUEUE_FWSCAN].limit = 1; |