diff options
| author | Herton Ronaldo Krzesinski <herton@mandriva.com.br> | 2009-02-13 08:35:13 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:53:30 -0700 |
| commit | b318a3a6c3ac92cfab6b3f94eab9890659957938 (patch) | |
| tree | 7f282abe778796edbd54039b8e0245dae785ac56 /drivers/staging/rtl8187se | |
| parent | 4913affd6ca41158fb29e19ca53ed2c83c041157 (diff) | |
| download | blackbird-op-linux-b318a3a6c3ac92cfab6b3f94eab9890659957938.tar.gz blackbird-op-linux-b318a3a6c3ac92cfab6b3f94eab9890659957938.zip | |
Staging: rtl8187se: fix build warnings
drivers/staging/rtl8187se/r8180_wx.c:1386: warning: initialization from incompatible pointer type
drivers/staging/rtl8187se/r8180_wx.c:1388: warning: initialization from incompatible pointer type
Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8187se')
| -rw-r--r-- | drivers/staging/rtl8187se/r8180_wx.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/rtl8187se/r8180_wx.c b/drivers/staging/rtl8187se/r8180_wx.c index 8b3901d87f87..979ba0b5f331 100644 --- a/drivers/staging/rtl8187se/r8180_wx.c +++ b/drivers/staging/rtl8187se/r8180_wx.c @@ -1274,8 +1274,8 @@ static int r8180_wx_set_enc_ext(struct net_device *dev, } static int r8180_wx_set_auth(struct net_device *dev, - struct iw_request_info *info, - struct iw_param *data, char *extra) + struct iw_request_info *info, + union iwreq_data *wrqu, char *extra) { //printk("====>%s()\n", __func__); struct r8180_priv *priv = ieee80211_priv(dev); @@ -1285,7 +1285,7 @@ static int r8180_wx_set_auth(struct net_device *dev, return 0; down(&priv->wx_sem); - ret = ieee80211_wx_set_auth(priv->ieee80211, info, data, extra); + ret = ieee80211_wx_set_auth(priv->ieee80211, info, &wrqu->param, extra); up(&priv->wx_sem); return ret; } @@ -1312,8 +1312,8 @@ static int r8180_wx_set_mlme(struct net_device *dev, return ret; } static int r8180_wx_set_gen_ie(struct net_device *dev, - struct iw_request_info *info, - struct iw_point *data, char *extra) + struct iw_request_info *info, + union iwreq_data *wrqu, char *extra) { // printk("====>%s(), len:%d\n", __func__, data->length); int ret=0; @@ -1325,7 +1325,7 @@ static int r8180_wx_set_gen_ie(struct net_device *dev, down(&priv->wx_sem); #if 1 - ret = ieee80211_wx_set_gen_ie(priv->ieee80211, extra, data->length); + ret = ieee80211_wx_set_gen_ie(priv->ieee80211, extra, wrqu->data.length); #endif up(&priv->wx_sem); //printk("<======%s(), ret:%d\n", __func__, ret); |
