diff --git a/[refs] b/[refs] index 4ad2f7b32ae2..a49302181649 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97bc5afff39bb10ac27588272562780c3d301c23 +refs/heads/master: 3f60498b87f3c3944f78dcd5a9d6e566a300a92b diff --git a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c index 97faad98130a..c71fb635c755 100644 --- a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c +++ b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c @@ -174,7 +174,7 @@ int ieee80211_wx_set_wap(struct ieee80211_device *ieee, return ret; } - int ieee80211_wx_get_essid(struct ieee80211_device *ieee, struct iw_request_info *a, +int ieee80211_wx_get_essid(struct ieee80211_device *ieee, struct iw_request_info *a, union iwreq_data *wrqu, char *b) { int len, ret = 0; @@ -395,7 +395,7 @@ int ieee80211_wx_set_essid(struct ieee80211_device *ieee, return ret; } - int ieee80211_wx_get_mode(struct ieee80211_device *ieee, struct iw_request_info *a, +int ieee80211_wx_get_mode(struct ieee80211_device *ieee, struct iw_request_info *a, union iwreq_data *wrqu, char *b) { @@ -403,7 +403,7 @@ int ieee80211_wx_set_essid(struct ieee80211_device *ieee, return 0; } - int ieee80211_wx_set_rawtx(struct ieee80211_device *ieee, +int ieee80211_wx_set_rawtx(struct ieee80211_device *ieee, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) {