diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-16 13:59:51 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-16 13:59:51 -0500 |
| commit | 0f62248501cbf5047486601d7e39d5ee36d478c2 (patch) | |
| tree | 66119712683a8e1d4d4339d72864ceeb7e1806f0 /drivers/net/wireless/mwifiex | |
| parent | b8d9e572cb8794335fb4ba63ff962acaa3c4473b (diff) | |
| parent | 6352c87ff69daa2211419ec2c34ddb8bc116c505 (diff) | |
| download | talos-obmc-linux-0f62248501cbf5047486601d7e39d5ee36d478c2.tar.gz talos-obmc-linux-0f62248501cbf5047486601d7e39d5ee36d478c2.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/mwifiex')
| -rw-r--r-- | drivers/net/wireless/mwifiex/cfg80211.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c index e29505c90cce..41be319665eb 100644 --- a/drivers/net/wireless/mwifiex/cfg80211.c +++ b/drivers/net/wireless/mwifiex/cfg80211.c @@ -324,6 +324,7 @@ mwifiex_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy, */ static int mwifiex_cfg80211_set_tx_power(struct wiphy *wiphy, + struct wireless_dev *wdev, enum nl80211_tx_power_setting type, int mbm) { |
