os_dep/linux/ioctl_linux.c: fix WIRELESS_EXT ifdefs

This commit is contained in:
65278 (Felix Wischke) 2019-12-20 12:23:10 +01:00
parent f01fb6e437
commit e1a4fd06f3

View File

@ -12863,6 +12863,8 @@ static int rtw_ioctl_wext_private(struct net_device *dev, struct ifreq *rq)
#endif /* CONFIG_COMPAT */ #endif /* CONFIG_COMPAT */
return rtw_ioctl_standard_wext_private(dev, rq); return rtw_ioctl_standard_wext_private(dev, rq);
} }
#endif /* CONFIG_WIRELESS_EXT */
#endif /* also CONFIG_WIRELESS_EXT */
int rtw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) int rtw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{ {
@ -12870,6 +12872,7 @@ int rtw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
int ret = 0; int ret = 0;
switch (cmd) { switch (cmd) {
#ifdef CONFIG_WIRELESS_EXT
case RTL_IOCTL_WPA_SUPPLICANT: case RTL_IOCTL_WPA_SUPPLICANT:
ret = wpa_supplicant_ioctl(dev, &wrq->u.data); ret = wpa_supplicant_ioctl(dev, &wrq->u.data);
break; break;
@ -12877,11 +12880,9 @@ int rtw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
case RTL_IOCTL_HOSTAPD: case RTL_IOCTL_HOSTAPD:
ret = rtw_hostapd_ioctl(dev, &wrq->u.data); ret = rtw_hostapd_ioctl(dev, &wrq->u.data);
break; break;
#ifdef CONFIG_WIRELESS_EXT
case SIOCSIWMODE: case SIOCSIWMODE:
ret = rtw_wx_set_mode(dev, NULL, &wrq->u, NULL); ret = rtw_wx_set_mode(dev, NULL, &wrq->u, NULL);
break; break;
#endif
#endif /* CONFIG_AP_MODE */ #endif /* CONFIG_AP_MODE */
case SIOCDEVPRIVATE: case SIOCDEVPRIVATE:
ret = rtw_ioctl_wext_private(dev, rq); ret = rtw_ioctl_wext_private(dev, rq);
@ -12889,6 +12890,7 @@ int rtw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
case (SIOCDEVPRIVATE+1): case (SIOCDEVPRIVATE+1):
ret = rtw_android_priv_cmd(dev, rq, cmd); ret = rtw_android_priv_cmd(dev, rq, cmd);
break; break;
#endif
default: default:
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
break; break;
@ -12897,5 +12899,3 @@ int rtw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
return ret; return ret;
} }
#endif
#endif