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_ioctl.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_ioctl.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/sta_ioctl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c index c8b50c7..237c8d2b 100644 --- a/drivers/net/wireless/mwifiex/sta_ioctl.c +++ b/drivers/net/wireless/mwifiex/sta_ioctl.c @@ -1044,7 +1044,6 @@ mwifiex_get_ver_ext(struct mwifiex_private *priv) int mwifiex_remain_on_chan_cfg(struct mwifiex_private *priv, u16 action, struct ieee80211_channel *chan, - enum nl80211_channel_type *ct, unsigned int duration) { struct host_cmd_ds_remain_on_chan roc_cfg; @@ -1054,7 +1053,7 @@ mwifiex_remain_on_chan_cfg(struct mwifiex_private *priv, u16 action, roc_cfg.action = cpu_to_le16(action); if (action == HostCmd_ACT_GEN_SET) { roc_cfg.band_cfg = chan->band; - sc = mwifiex_chan_type_to_sec_chan_offset(*ct); + sc = mwifiex_chan_type_to_sec_chan_offset(NL80211_CHAN_NO_HT); roc_cfg.band_cfg |= (sc << 2); roc_cfg.channel = |
