From cdf7da847eb7040040744e05fb72983040ac715f Mon Sep 17 00:00:00 2001 From: Herton Ronaldo Krzesinski Date: Fri, 13 Feb 2009 08:35:13 -0500 Subject: [PATCH] --- yaml --- r: 141271 b: refs/heads/master c: b318a3a6c3ac92cfab6b3f94eab9890659957938 h: refs/heads/master i: 141269: 5b709ccd8fc574a23a061a2861b9c25baa75c03c 141267: 8f4e9777b1d72957a74b2a3076009ce2e21a4a9a 141263: 9906a1224950d3dd674976089b3bd20959fb8c89 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8187se/r8180_wx.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 6d5d19ee2f15..ab5f3bbf225e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4913affd6ca41158fb29e19ca53ed2c83c041157 +refs/heads/master: b318a3a6c3ac92cfab6b3f94eab9890659957938 diff --git a/trunk/drivers/staging/rtl8187se/r8180_wx.c b/trunk/drivers/staging/rtl8187se/r8180_wx.c index 8b3901d87f87..979ba0b5f331 100644 --- a/trunk/drivers/staging/rtl8187se/r8180_wx.c +++ b/trunk/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);