From: Mateusz Kulikowski Date: Sun, 20 Sep 2015 08:18:49 +0000 (+0200) Subject: staging: rtl8192e: Rename r8192_wx_get_nick X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1341a077a24d270b3957538a16ff682497776811;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git staging: rtl8192e: Rename r8192_wx_get_nick Use naming schema found in other rtlwifi devices. Rename r8192_wx_get_nick to _rtl92e_wx_get_nick. 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 5a9f6b3f67aa..2312d01cf634 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -558,9 +558,9 @@ static int r8192_wx_set_nick(struct net_device *dev, } -static int r8192_wx_get_nick(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) +static int _rtl92e_wx_get_nick(struct net_device *dev, + struct iw_request_info *info, + union iwreq_data *wrqu, char *extra) { struct r8192_priv *priv = rtllib_priv(dev); @@ -1132,7 +1132,7 @@ static iw_handler r8192_wx_handlers[] = { [IW_IOCTL(SIOCSIWESSID)] = r8192_wx_set_essid, [IW_IOCTL(SIOCGIWESSID)] = _rtl92e_wx_get_essid, [IW_IOCTL(SIOCSIWNICKN)] = r8192_wx_set_nick, - [IW_IOCTL(SIOCGIWNICKN)] = r8192_wx_get_nick, + [IW_IOCTL(SIOCGIWNICKN)] = _rtl92e_wx_get_nick, [IW_IOCTL(SIOCSIWRATE)] = r8192_wx_set_rate, [IW_IOCTL(SIOCGIWRATE)] = r8192_wx_get_rate, [IW_IOCTL(SIOCSIWRTS)] = r8192_wx_set_rts,