diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-03-13 19:21:43 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-03-13 19:21:43 +0100 |
| commit | 42775a34d23027b19e984956a539448f5e7ff075 (patch) | |
| tree | e344340c7f0aed4c8faf7534fabbc64607a8e784 /net/wireless/chan.c | |
| parent | net: sctp: remove NULL check in sctp_assoc_update_retran_path (diff) | |
| parent | rtlwifi: rtl8723be: Fix array dimension problems (diff) | |
| download | linux-42775a34d23027b19e984956a539448f5e7ff075.tar.xz linux-42775a34d23027b19e984956a539448f5e7ff075.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/ath/ath9k/recv.c
Diffstat (limited to 'net/wireless/chan.c')
| -rw-r--r-- | net/wireless/chan.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/wireless/chan.c b/net/wireless/chan.c index 2d4268c5529d..cd10c1985074 100644 --- a/net/wireless/chan.c +++ b/net/wireless/chan.c @@ -705,12 +705,8 @@ cfg80211_get_chan_state(struct wireless_dev *wdev, case NL80211_IFTYPE_MONITOR: case NL80211_IFTYPE_AP_VLAN: case NL80211_IFTYPE_WDS: - /* these interface types don't really have a channel */ - return; case NL80211_IFTYPE_P2P_DEVICE: - if (wdev->wiphy->features & - NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL) - *chanmode = CHAN_MODE_EXCLUSIVE; + /* these interface types don't really have a channel */ return; case NL80211_IFTYPE_UNSPECIFIED: case NUM_NL80211_IFTYPES: |