diff options
| author | Jasper Bryant-Greene <jasper@amiton.co.nz> | 2008-08-03 12:04:37 +1200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-08-22 16:29:58 -0400 |
| commit | f698d856f65c3fea091cc303a135967965c5b880 (patch) | |
| tree | 94c7c2d561e5191646dc5798683c0aca97973773 /net/mac80211/event.c | |
| parent | fef1643bf0cdd092a52dc3378479e4811fd65152 (diff) | |
| download | linux-3.10-f698d856f65c3fea091cc303a135967965c5b880.tar.gz linux-3.10-f698d856f65c3fea091cc303a135967965c5b880.tar.bz2 linux-3.10-f698d856f65c3fea091cc303a135967965c5b880.zip | |
replace net_device arguments with ieee80211_{local,sub_if_data} as appropriate
This patch replaces net_device arguments to mac80211 internal functions
with ieee80211_{local,sub_if_data} as appropriate.
It also does the same for many 802.11s mesh functions, and changes the
mesh path table to be indexed on sub_if_data rather than net_device.
If the mesh part needs to be a separate patch let me know, but since
mesh uses a lot of mac80211 functions which were being converted anyway,
the changes go hand-in-hand somewhat.
This patch probably does not convert all the functions which could be
converted, but it is a large chunk and followup patches will be
provided.
Signed-off-by: Jasper Bryant-Greene <jasper@amiton.co.nz>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/event.c')
| -rw-r--r-- | net/mac80211/event.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/mac80211/event.c b/net/mac80211/event.c index 2280f40b456..8de60de70bc 100644 --- a/net/mac80211/event.c +++ b/net/mac80211/event.c @@ -8,7 +8,6 @@ * mac80211 - events */ -#include <linux/netdevice.h> #include <net/iw_handler.h> #include "ieee80211_i.h" @@ -17,7 +16,7 @@ * (in the variable hdr) must be long enough to extract the TKIP * fields like TSC */ -void mac80211_ev_michael_mic_failure(struct net_device *dev, int keyidx, +void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int keyidx, struct ieee80211_hdr *hdr) { union iwreq_data wrqu; @@ -32,7 +31,7 @@ void mac80211_ev_michael_mic_failure(struct net_device *dev, int keyidx, print_mac(mac, hdr->addr2)); memset(&wrqu, 0, sizeof(wrqu)); wrqu.data.length = strlen(buf); - wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf); + wireless_send_event(sdata->dev, IWEVCUSTOM, &wrqu, buf); kfree(buf); } |