diff options
| author | David S. Miller | 2016-05-12 17:46:58 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-05-12 17:46:58 +0200 |
| commit | 7fd38193d0473acc6e8f108107d0466f07768853 (patch) | |
| tree | 076f5d81a643c818dcf6561dad0f3d75d1049dc5 /net/wireless/reg.c | |
| parent | Merge branch 'qed-sriov' (diff) | |
| parent | mac80211: allow software PS-Poll/U-APSD with AP_LINK_PS (diff) | |
| download | kernel-qcow2-linux-7fd38193d0473acc6e8f108107d0466f07768853.tar.gz kernel-qcow2-linux-7fd38193d0473acc6e8f108107d0466f07768853.tar.xz kernel-qcow2-linux-7fd38193d0473acc6e8f108107d0466f07768853.zip | |
Merge tag 'mac80211-next-for-davem-2016-05-12' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Some more work for 4.7, notably:
* completion and fixups of nla_put_64_64bit() work
* remove a/b/g/n from wext nickname to avoid confusion
with 11ac (which wouldn't even fit fully there due to
string length restrictions)
along with some other minor changes/cleanups.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/reg.c')
| -rw-r--r-- | net/wireless/reg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index e271dea6bc02..5dbac3749738 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1639,7 +1639,7 @@ static void reg_leave_invalid_chans(struct wiphy *wiphy) ASSERT_RTNL(); - list_for_each_entry(wdev, &rdev->wdev_list, list) + list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list) if (!reg_wdev_chan_valid(wiphy, wdev)) cfg80211_leave(rdev, wdev); } |