diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-11 03:26:41 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-11 03:26:41 +0400 |
| commit | 69f1de1f7c3cac1741290cd38474caca77acd759 (patch) | |
| tree | 5fa4054f8db6b1f6661451440a5ba26adb29eda1 /net/wireless/util.c | |
| parent | b5ec8eeac46a99004c26791f70b15d001e970acf (diff) | |
| parent | 039aafba1b57ed39acb3abc290c11be37402feb2 (diff) | |
| download | linux-69f1de1f7c3cac1741290cd38474caca77acd759.tar.xz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says:
====================
Here is a handful of fixes intended for 3.6.
Daniel Drake offers a cfg80211 fix to consume pending events before
taking a wireless device down. This prevents a resource leak.
Stanislaw Gruszka gives us a fix for a NULL pointer dereference in
rt61pci.
Johannes Berg provides an iwlwifi patch to disable "greenfield" mode.
Use of that mode was causing a rate scaling problem in for iwlwifi.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/util.c')
| -rw-r--r-- | net/wireless/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index 26f8cd30f712..994e2f0cc7a8 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -735,7 +735,7 @@ void cfg80211_upload_connect_keys(struct wireless_dev *wdev) wdev->connect_keys = NULL; } -static void cfg80211_process_wdev_events(struct wireless_dev *wdev) +void cfg80211_process_wdev_events(struct wireless_dev *wdev) { struct cfg80211_event *ev; unsigned long flags; |