From: Mateusz Kulikowski Date: Sun, 20 Sep 2015 08:18:46 +0000 (+0200) Subject: staging: rtl8192e: Rename r8192_wx_get_gen_ie X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d343ed7fa1845843be27d663bacb25a5345a6864;p=openwrt%2Fstaging%2Fblogic.git staging: rtl8192e: Rename r8192_wx_get_gen_ie Use naming schema found in other rtlwifi devices. Rename r8192_wx_get_gen_ie to _rtl92e_wx_get_gen_ie. Signed-off-by: Mateusz Kulikowski Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c index 30a40a07559e..8e3c44231b62 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -1030,9 +1030,9 @@ static int r8192_wx_set_gen_ie(struct net_device *dev, return ret; } -static int r8192_wx_get_gen_ie(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *data, char *extra) +static int _rtl92e_wx_get_gen_ie(struct net_device *dev, + struct iw_request_info *info, + union iwreq_data *data, char *extra) { int ret = 0; struct r8192_priv *priv = rtllib_priv(dev); @@ -1145,7 +1145,7 @@ static iw_handler r8192_wx_handlers[] = { [IW_IOCTL(SIOCSIWPOWER)] = r8192_wx_set_power, [IW_IOCTL(SIOCGIWPOWER)] = r8192_wx_get_power, [IW_IOCTL(SIOCSIWGENIE)] = r8192_wx_set_gen_ie, - [IW_IOCTL(SIOCGIWGENIE)] = r8192_wx_get_gen_ie, + [IW_IOCTL(SIOCGIWGENIE)] = _rtl92e_wx_get_gen_ie, [IW_IOCTL(SIOCSIWMLME)] = r8192_wx_set_mlme, [IW_IOCTL(SIOCSIWAUTH)] = r8192_wx_set_auth, [IW_IOCTL(SIOCSIWENCODEEXT)] = r8192_wx_set_enc_ext,