Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141271
b: refs/heads/master
c: b318a3a
h: refs/heads/master
i:
  141269: 5b709cc
  141267: 8f4e977
  141263: 9906a12
v: v3
  • Loading branch information
Herton Ronaldo Krzesinski authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 8d37f67 commit cdf7da8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4913affd6ca41158fb29e19ca53ed2c83c041157
refs/heads/master: b318a3a6c3ac92cfab6b3f94eab9890659957938
12 changes: 6 additions & 6 deletions trunk/drivers/staging/rtl8187se/r8180_wx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
}
Expand All @@ -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;
Expand All @@ -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);
Expand Down

0 comments on commit cdf7da8

Please sign in to comment.