From: Mateusz Kulikowski Date: Sun, 20 Sep 2015 08:18:55 +0000 (+0200) Subject: staging: rtl8192e: Rename r8192_wx_get_scan X-Git-Tag: firefly_0821_release~176^2~802^2~1598 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4d7b35c724c00354a8991daac951c4cfaebc8562;p=firefly-linux-kernel-4.4.55.git staging: rtl8192e: Rename r8192_wx_get_scan Use naming schema found in other rtlwifi devices. Rename r8192_wx_get_scan to _rtl92e_wx_get_scan. 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 ecd024c0bc89..389299c5034a 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -480,8 +480,9 @@ static int r8192_wx_set_scan(struct net_device *dev, struct iw_request_info *a, } -static int r8192_wx_get_scan(struct net_device *dev, struct iw_request_info *a, - union iwreq_data *wrqu, char *b) +static int _rtl92e_wx_get_scan(struct net_device *dev, + struct iw_request_info *a, + union iwreq_data *wrqu, char *b) { int ret; @@ -1128,7 +1129,7 @@ static iw_handler r8192_wx_handlers[] = { [IW_IOCTL(SIOCSIWAP)] = r8192_wx_set_wap, [IW_IOCTL(SIOCGIWAP)] = r8192_wx_get_wap, [IW_IOCTL(SIOCSIWSCAN)] = r8192_wx_set_scan, - [IW_IOCTL(SIOCGIWSCAN)] = r8192_wx_get_scan, + [IW_IOCTL(SIOCGIWSCAN)] = _rtl92e_wx_get_scan, [IW_IOCTL(SIOCSIWESSID)] = r8192_wx_set_essid, [IW_IOCTL(SIOCGIWESSID)] = _rtl92e_wx_get_essid, [IW_IOCTL(SIOCSIWNICKN)] = r8192_wx_set_nick,