aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/net/wireless/util.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-09-07 09:48:59 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-09-07 09:48:59 +1000
commitfff34b3412b9401a76ba9d021db1bd91cb0e02b6 (patch)
tree870ed2d1555004e7939d15b5099017aae61c97b8 /net/wireless/util.c
parentpowerpc/kprobes: Rename opcode_t in probes.h to ppc_opcode_t (diff)
parentpowerpc: Don't use __put_user() in patch_instruction (diff)
downloadwireguard-linux-fff34b3412b9401a76ba9d021db1bd91cb0e02b6.tar.xz
wireguard-linux-fff34b3412b9401a76ba9d021db1bd91cb0e02b6.zip
Merge branch 'merge' into next
Brings in various bug fixes from 3.6-rcX
Diffstat (limited to 'net/wireless/util.c')
-rw-r--r--net/wireless/util.c2
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;