staging: rtl8192e: Pass ieee80211_device to callbacks

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211.h b/drivers/staging/rtl8192e/ieee80211/ieee80211.h
index af64653..527c368 100644 (file)
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211.h
@@ -2165,16 +2165,16 @@ struct ieee80211_device {
         * The fucntion start_scan should initiate the background
         * scanning and can't sleep.
         */
-       void (*scan_syncro)(struct net_device *dev);
-       void (*start_scan)(struct net_device *dev);
-       void (*stop_scan)(struct net_device *dev);
+       void (*scan_syncro)(struct ieee80211_device *ieee80211);
+       void (*start_scan)(struct ieee80211_device *ieee80211);
+       void (*stop_scan)(struct ieee80211_device *ieee80211);
 
        /* indicate the driver that the link state is changed
         * for example it may indicate the card is associated now.
         * Driver might be interested in this to apply RX filter
         * rules or simply light the LINK led
         */
-       void (*link_change)(struct net_device *dev);
+       void (*link_change)(struct ieee80211_device *ieee80211);
 
        /* these two function indicates to the HW when to start
         * and stop to send beacons. This is used when the

diff --cc drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
Simple merge

diff --cc drivers/staging/rtl8192e/ieee80211/ieee80211_softmac_wx.c
Simple merge

diff --cc drivers/staging/rtl8192e/r8192E_core.c
Simple merge