From: Mateusz Kulikowski Date: Sun, 20 Sep 2015 08:18:42 +0000 (+0200) Subject: staging: rtl8192e: Rename r8192_wx_get_enc X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=00496b54d60e996e9c9de6b204ca0830d09c7933;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git staging: rtl8192e: Rename r8192_wx_get_enc Use naming schema found in other rtlwifi devices. Rename r8192_wx_get_enc to _rtl92e_wx_get_enc. 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 d53e885584f4..c95570b39bc3 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -667,9 +667,9 @@ static int r8192_wx_get_wap(struct net_device *dev, } -static int r8192_wx_get_enc(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, char *key) +static int _rtl92e_wx_get_enc(struct net_device *dev, + struct iw_request_info *info, + union iwreq_data *wrqu, char *key) { struct r8192_priv *priv = rtllib_priv(dev); @@ -1141,7 +1141,7 @@ static iw_handler r8192_wx_handlers[] = { [IW_IOCTL(SIOCSIWRETRY)] = r8192_wx_set_retry, [IW_IOCTL(SIOCGIWRETRY)] = r8192_wx_get_retry, [IW_IOCTL(SIOCSIWENCODE)] = r8192_wx_set_enc, - [IW_IOCTL(SIOCGIWENCODE)] = r8192_wx_get_enc, + [IW_IOCTL(SIOCGIWENCODE)] = _rtl92e_wx_get_enc, [IW_IOCTL(SIOCSIWPOWER)] = r8192_wx_set_power, [IW_IOCTL(SIOCGIWPOWER)] = r8192_wx_get_power, [IW_IOCTL(SIOCSIWGENIE)] = r8192_wx_set_gen_ie,