Commit 01f8a27e authored Aug 17, 2012 by Emil Goode Committed by Greg Kroah-Hartman Sep 04, 2012

staging: wlan-ng: Fix problem with wrong arguments



The function pointer scan in struct cfg80211_ops is not
supposed to be assigned a function with a struct net_device
pointer as an argument. Instead access the net_device struct
in the following way:

struct net_device *dev = request->wdev->netdev;

sparse gives these warnings:

drivers/staging/wlan-ng/cfg80211.c:726:17: warning:
        incorrect type in initializer (incompatible argument 2
        (different base types))
        expected int ( *scan )( ... )
        got int ( extern [toplevel] *<noident> )( ... )

drivers/staging/wlan-ng/cfg80211.c:726:2: warning:
        initialization from incompatible pointer type [enabled by default]

drivers/staging/wlan-ng/cfg80211.c:726:2: warning:
        (near initialization for ‘prism2_usb_cfg_ops.scan’)
        [enabled by default]

Signed-off-by: Emil Goode <emilgoode@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent d947d635

drivers/staging/wlan-ng/cfg80211.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -327,9 +327,9 @@ int prism2_get_station(struct wiphy wiphy, struct net_device dev,
		return result;
		}

		int prism2_scan(struct wiphy wiphy, struct net_device dev,
		struct cfg80211_scan_request *request)
		int prism2_scan(struct wiphy wiphy, struct cfg80211_scan_request request)
		{
		struct net_device *dev = request->wdev->netdev;
		struct prism2_wiphy_private *priv = wiphy_priv(wiphy);
		wlandevice_t *wlandev = dev->ml_priv;
		struct p80211msg_dot11req_scan msg1;