Subject: [PATCH -next] staging/winbond: fix wbusb struct warnings/error

From: Randy Dunlap <[email-masked]>
Date: Sun, 17 Jan 2010 15:13:50 -0800

From: Randy Dunlap <[email-masked]>

Fix winbond wbusb warnings:

drivers/staging/winbond/wbusb.c:68: warning: 'struct ieee80211_if_init_conf' declared inside parameter list
drivers/staging/winbond/wbusb.c:68: warning: its scope is only this definition or declaration, which is probably not what you want
drivers/staging/winbond/wbusb.c:72: error: dereferencing pointer to incomplete type
drivers/staging/winbond/wbusb.c:78: warning: 'struct ieee80211_if_init_conf' declared inside parameter list
drivers/staging/winbond/wbusb.c:284: warning: initialization from incompatible pointer type
drivers/staging/winbond/wbusb.c:285: warning: initialization from incompatible pointer type

Signed-off-by: Randy Dunlap <[email-masked]>
---
 drivers/staging/winbond/wbusb.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- linux-next-20100111.orig/drivers/staging/winbond/wbusb.c
+++ linux-next-20100111/drivers/staging/winbond/wbusb.c
@@ -65,17 +65,17 @@ static void hal_set_beacon_period(struct
 }
 
 static int wbsoft_add_interface(struct ieee80211_hw *dev,
-				struct ieee80211_if_init_conf *conf)
+				struct ieee80211_vif *conf)
 {
 	struct wbsoft_priv *priv = dev->priv;
 
-	hal_set_beacon_period(&priv->sHwData, conf->vif->bss_conf.beacon_int);
+	hal_set_beacon_period(&priv->sHwData, conf->>bss_conf.beacon_int);
 
 	return 0;
 }
 
 static void wbsoft_remove_interface(struct ieee80211_hw *dev,
-				    struct ieee80211_if_init_conf *conf)
+				    struct ieee80211_vif *conf)
 {
 	printk("wbsoft_remove interface called\n");
 }