diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-26 14:46:41 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-26 14:46:41 -0500 |
| commit | 62c8003ecb973986958e9dade4a7e598349caf48 (patch) | |
| tree | 0e831639cd6449c2955234cfc37ef46481c788d1 /drivers/net/wireless/mwifiex/sta_event.c | |
| parent | e4cb3ff9311e0817e65cda7bc53898348aab7527 (diff) | |
| parent | ec816087e8978b74c1bd5fae0e335dd97d964e9f (diff) | |
| download | op-kernel-dev-62c8003ecb973986958e9dade4a7e598349caf48.zip op-kernel-dev-62c8003ecb973986958e9dade4a7e598349caf48.tar.gz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/mwifiex/sta_event.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/sta_event.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/sta_event.c b/drivers/net/wireless/mwifiex/sta_event.c index 5b0d719..41aafc7 100644 --- a/drivers/net/wireless/mwifiex/sta_event.c +++ b/drivers/net/wireless/mwifiex/sta_event.c @@ -421,7 +421,6 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv) cfg80211_remain_on_channel_expired(priv->wdev, priv->roc_cfg.cookie, &priv->roc_cfg.chan, - priv->roc_cfg.chan_type, GFP_ATOMIC); memset(&priv->roc_cfg, 0x00, sizeof(struct mwifiex_roc_cfg)); |
