qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-14 08:01:53 +02:00
Code

some fixes for wlcompat

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1194 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2005-06-11 01:48:39 +00:00
parent 3a6a6bad8b
commit 947c8ccd92
2 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openwrt/target/linux/package/wlcompat/Makefile
View File

@ -26,10 +26,10 @@ $(PKG_BUILD_DIR)/.prepared:
$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/wlcompat.o $(PKG_BUILD_DIR)/wlcompat-debug.o $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/wlcompat.o $(PKG_BUILD_DIR)/wlcompat-debug.o
touch $@ touch $@
$(PKG_BUILD_DIR)/wlcompat.o: $(PKG_BUILD_DIR)/wlcompat.o: $(PKG_BUILD_DIR)/.prepared
$(TARGET_CC) $(WLCOMPAT_FLAGS) -o $@ wlcompat.c $(TARGET_CC) $(WLCOMPAT_FLAGS) -o $@ wlcompat.c
$(PKG_BUILD_DIR)/wlcompat-debug.o: $(PKG_BUILD_DIR)/wlcompat-debug.o: $(PKG_BUILD_DIR)/.prepared
$(TARGET_CC) -DDEBUG $(WLCOMPAT_FLAGS) -o $@ wlcompat.c $(TARGET_CC) -DDEBUG $(WLCOMPAT_FLAGS) -o $@ wlcompat.c
$(IPKG_KMOD_WLCOMPAT): $(PKG_BUILD_DIR)/wlcompat.o $(PKG_BUILD_DIR)/wlcompat-debug.o $(IPKG_KMOD_WLCOMPAT): $(PKG_BUILD_DIR)/wlcompat.o $(PKG_BUILD_DIR)/wlcompat-debug.o

37
openwrt/target/linux/package/wlcompat/wlcompat.c
View File

@ -83,6 +83,7 @@ static int wl_set_val(struct net_device *dev, char *var, void *val, int len)
{ {
char buf[128]; char buf[128];
int buf_len; int buf_len;
int ret;
/* check for overflow */ /* check for overflow */
if ((buf_len = strlen(var)) + 1 + len > sizeof(buf)) if ((buf_len = strlen(var)) + 1 + len > sizeof(buf))
@ -92,23 +93,25 @@ static int wl_set_val(struct net_device *dev, char *var, void *val, int len)
buf_len += 1; buf_len += 1;
/* append int value onto the end of the name string */ /* append int value onto the end of the name string */
memcpy(&buf[buf_len], val, len); memcpy(&(buf[buf_len]), val, len);
buf_len += len; buf_len += len;
return wl_ioctl(dev, WLC_SET_VAR, buf, buf_len); ret = wl_ioctl(dev, WLC_SET_VAR, buf, buf_len);
return ret;
} }
static int wl_get_val(struct net_device *dev, char *var, void *val, int len) static int wl_get_val(struct net_device *dev, char *var, void *val, int len)
{ {
char buf[128]; char buf[128];
int buf_len;
int ret; int ret;
/* check for overflow */ /* check for overflow */
if (strlen(var) + 1 > sizeof(buf) || len > sizeof(buf)) if ((buf_len = strlen(var)) + 1 > sizeof(buf) || len > sizeof(buf))
return -1; return -1;
strcpy(buf, var); strcpy(buf, var);
if ((ret = wl_ioctl(dev, WLC_GET_VAR, buf, sizeof(buf)))) if (ret = wl_ioctl(dev, WLC_GET_VAR, buf, buf_len + len))
return ret; return ret;
memcpy(val, buf, len); memcpy(val, buf, len);
@ -309,6 +312,11 @@ static int wlcompat_ioctl(struct net_device *dev,
} }
case SIOCSIWFREQ: case SIOCSIWFREQ:
{ {
if (wrqu->freq.m == -1) {
wrqu->freq.m = 0;
if (wl_ioctl(dev, WLC_SET_CHANNEL, &wrqu->freq.m, sizeof(int)) < 0)
return -EINVAL;
} else {
if (wrqu->freq.e == 1) { if (wrqu->freq.e == 1) {
int channel = 0; int channel = 0;
int f = wrqu->freq.m / 100000; int f = wrqu->freq.m / 100000;
@ -327,6 +335,7 @@ static int wlcompat_ioctl(struct net_device *dev,
} else { } else {
return -EINVAL; return -EINVAL;
} }
}
break; break;
} }
case SIOCSIWAP: case SIOCSIWAP:
@ -425,24 +434,26 @@ static int wlcompat_ioctl(struct net_device *dev,
return -EINVAL; return -EINVAL;
if (!wrqu->txpower.disabled) { if (!wrqu->txpower.disabled) {
int override; int value;
if (wl_get_val(dev, "qtxpower", &override, sizeof(int)) < 0) if (wl_get_val(dev, "qtxpower", &value, sizeof(int)) < 0)
return -EINVAL; return -EINVAL;
wrqu->txpower.value |= override & WL_TXPWR_OVERRIDE; value &= WL_TXPWR_OVERRIDE;
wrqu->txpower.value |= value;
if (wrqu->txpower.flags != IW_TXPOW_MWATT) if (wrqu->txpower.flags != IW_TXPOW_MWATT)
return -EINVAL; return -EINVAL;
if (wl_set_val(dev, "qtxpower", &wrqu->txpower.value, sizeof(int)) < 0) if (wrqu->txpower.value > 0)
if (wl_set_val(dev, "qtxpower", &(wrqu->txpower.value), sizeof(int)) < 0)
return -EINVAL; return -EINVAL;
} }
break;
} }
case SIOCSIWENCODE: case SIOCSIWENCODE:
{ {
int wep = 1, wrestrict = 1; int val = 0, wep = 1, wrestrict = 1;
int index = (wrqu->data.flags & IW_ENCODE_INDEX) - 1; int index = (wrqu->data.flags & IW_ENCODE_INDEX) - 1;
if (index < 0) if (index < 0)
@ -471,12 +482,16 @@ static int wlcompat_ioctl(struct net_device *dev,
if (wl_ioctl(dev, WLC_SET_KEY_PRIMARY, &index, sizeof(index)) < 0) if (wl_ioctl(dev, WLC_SET_KEY_PRIMARY, &index, sizeof(index)) < 0)
return -EINVAL; return -EINVAL;
if (wl_ioctl(dev, WLC_SET_WSEC, &wep, sizeof(wep)) < 0) 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; return -EINVAL;
if (wrestrict >= 0) if (wrestrict >= 0)
if (wl_ioctl(dev, WLC_SET_WEP_RESTRICT, &wrestrict, sizeof(wrestrict)) < 0) if (wl_ioctl(dev, WLC_SET_WEP_RESTRICT, &wrestrict, sizeof(wrestrict)) < 0)
return -EINVAL; return -EINVAL;
break;
} }
case SIOCGIWENCODE: case SIOCGIWENCODE:
{ {