1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-10 19:25:20 +02:00

fix iwconfig eth1 enc on/off

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1466 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2005-07-16 16:38:44 +00:00
parent fb1291ca4c
commit 57176eb320

View File

@ -459,8 +459,15 @@ static int wlcompat_ioctl(struct net_device *dev,
if (index < 0) if (index < 0)
index = get_primary_key(dev); index = get_primary_key(dev);
if (wrqu->data.flags & IW_ENCODE_DISABLED) if (wrqu->data.flags & IW_ENCODE_DISABLED) {
wep = 0; wep = 0;
if (wl_ioctl(dev, WLC_SET_WSEC, &wep, sizeof(val)) < 0)
return -EINVAL;
return 0;
}
if (wl_ioctl(dev, WLC_SET_WSEC, &wep, sizeof(val)) < 0)
return -EINVAL;
if (wrqu->data.flags & IW_ENCODE_OPEN) if (wrqu->data.flags & IW_ENCODE_OPEN)
wrestrict = 0; wrestrict = 0;
@ -479,18 +486,11 @@ static int wlcompat_ioctl(struct net_device *dev,
} }
if (index >= 0) if (index >= 0)
if (wl_ioctl(dev, WLC_SET_KEY_PRIMARY, &index, sizeof(index)) < 0) wl_ioctl(dev, WLC_SET_KEY_PRIMARY, &index, sizeof(index));
return -EINVAL;
if (wl_ioctl(dev, WLC_GET_WSEC, &val, sizeof(val)) < 0)
return -EINVAL;
val |= wep;
if (wl_ioctl(dev, WLC_SET_WSEC, &val, sizeof(val)) < 0)
return -EINVAL;
if (wrestrict >= 0) if (wrestrict >= 0)
if (wl_ioctl(dev, WLC_SET_WEP_RESTRICT, &wrestrict, sizeof(wrestrict)) < 0) wl_ioctl(dev, WLC_SET_WEP_RESTRICT, &wrestrict, sizeof(wrestrict));
return -EINVAL;
break; break;
} }
case SIOCGIWENCODE: case SIOCGIWENCODE: