qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-28 10:52:25 +02:00
Code

fix wlcompat-debug, add proper signal strength info to scan and stats

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1870 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2005-09-07 15:34:50 +00:00
parent e56bc83fee
commit 098b31dec0
2 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,12 +3,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME := kmod-wlcompat PKG_NAME := kmod-wlcompat
PKG_RELEASE := 1 PKG_RELEASE := 3
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
include $(TOPDIR)/package/rules.mk include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,KMOD_WLCOMPAT,$(PKG_NAME),$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) $(eval $(call PKG_template,KMOD_WLCOMPAT,$(PKG_NAME),$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
$(eval $(call PKG_template,KMOD_WLCOMPAT_DEBUG,$(PKG_NAME)-debug,$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
ifeq ($(KERNEL_DIR),) ifeq ($(KERNEL_DIR),)
KERNEL_DIR:=$(LINUX_DIR) KERNEL_DIR:=$(LINUX_DIR)
@ -40,7 +41,7 @@ $(IPKG_KMOD_WLCOMPAT): $(PKG_BUILD_DIR)/wlcompat.o
$(IPKG_BUILD) $(IDIR_KMOD_WLCOMPAT) $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_KMOD_WLCOMPAT) $(PACKAGE_DIR)
$(IPKG_KMOD_WLCOMPAT_DEBUG): $(PKG_BUILD_DIR)/wlcompat-debug.o $(IPKG_KMOD_WLCOMPAT_DEBUG): $(PKG_BUILD_DIR)/wlcompat-debug.o
mkdir -p $(IDIR_KMOD_WLCOMPAT)/lib/modules/$(LINUX_VERSION) mkdir -p $(IDIR_KMOD_WLCOMPAT_DEBUG)/lib/modules/$(LINUX_VERSION)
cp $(PKG_BUILD_DIR)/wlcompat-debug.o $(IDIR_KMOD_WLCOMPAT)/lib/modules/$(LINUX_VERSION)/ cp $(PKG_BUILD_DIR)/wlcompat-debug.o $(IDIR_KMOD_WLCOMPAT_DEBUG)/lib/modules/$(LINUX_VERSION)/
$(IPKG_BUILD) $(IDIR_KMOD_WLCOMPAT_DEBUG) $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_KMOD_WLCOMPAT_DEBUG) $(PACKAGE_DIR)

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

@ -34,6 +34,7 @@
static struct net_device *dev; static struct net_device *dev;
static unsigned short bss_force; static unsigned short bss_force;
static struct iw_statistics wstats;
char buf[WLC_IOCTL_MAXLEN]; char buf[WLC_IOCTL_MAXLEN];
/* The frequency of each channel in MHz */ /* The frequency of each channel in MHz */
@ -167,6 +168,10 @@ static int wlcompat_ioctl_getiwrange(struct net_device *dev,
range->min_pmt = 0; range->min_pmt = 0;
range->max_pmt = 65535 * 1000; range->max_pmt = 65535 * 1000;
range->max_qual.qual = 0;
range->max_qual.level = 100;
range->max_qual.noise = 100;
range->min_rts = 0; range->min_rts = 0;
if (wl_ioctl(dev, WLC_GET_RTS, &range->max_rts, sizeof(int)) < 0) if (wl_ioctl(dev, WLC_GET_RTS, &range->max_rts, sizeof(int)) < 0)
range->max_rts = 2347; range->max_rts = 2347;
@ -216,6 +221,31 @@ static int wlcompat_set_scan(struct net_device *dev,
} }
struct iw_statistics *wlcompat_get_wireless_stats(struct net_device *dev)
{
wl_bss_info_t *bss_info = (wl_bss_info_t *) buf;
get_pktcnt_t pkt;
int rssi, noise;
memset(&wstats, 0, sizeof(wstats));
memset(&pkt, 0, sizeof(pkt));
memset(buf, 0, sizeof(buf));
bss_info->version = 0x2000;
wl_ioctl(dev, WLC_GET_BSS_INFO, bss_info, WLC_IOCTL_MAXLEN);
wl_ioctl(dev, WLC_GET_PKTCNTS, &pkt, sizeof(pkt));
// somehow the structure doesn't fit here
noise = buf[0x50];
rssi = buf[0x52];
wstats.qual.level = rssi;
wstats.qual.noise = -100 + noise;
wstats.discard.misc = pkt.rx_bad_pkt;
wstats.discard.retries = pkt.tx_bad_pkt;
return &wstats;
}
static int wlcompat_get_scan(struct net_device *dev, static int wlcompat_get_scan(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, union iwreq_data *wrqu,
@ -229,7 +259,10 @@ static int wlcompat_get_scan(struct net_device *dev,
char *end_buf = extra + IW_SCAN_MAX_DATA; char *end_buf = extra + IW_SCAN_MAX_DATA;
struct iw_event iwe; struct iw_event iwe;
int i, j; int i, j;
int rssi, noise;
results->buflen = WLC_IOCTL_MAXLEN - sizeof(wl_scan_results_t);
if (wl_ioctl(dev, WLC_SCAN_RESULTS, buf, WLC_IOCTL_MAXLEN) < 0) if (wl_ioctl(dev, WLC_SCAN_RESULTS, buf, WLC_IOCTL_MAXLEN) < 0)
return -EAGAIN; return -EAGAIN;
@ -259,9 +292,9 @@ static int wlcompat_get_scan(struct net_device *dev,
/* add quality statistics */ /* add quality statistics */
iwe.cmd = IWEVQUAL; iwe.cmd = IWEVQUAL;
iwe.u.qual.qual = 0;
iwe.u.qual.level = bss_info->RSSI; iwe.u.qual.level = bss_info->RSSI;
iwe.u.qual.noise = bss_info->phy_noise; iwe.u.qual.noise = bss_info->phy_noise;
iwe.u.qual.qual = 0;
current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN); current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
/* send rate information */ /* send rate information */
@ -946,6 +979,7 @@ static int __init wlcompat_init()
old_ioctl = dev->do_ioctl; old_ioctl = dev->do_ioctl;
dev->do_ioctl = new_ioctl; dev->do_ioctl = new_ioctl;
dev->wireless_handlers = (struct iw_handler_def *)&wlcompat_handler_def; dev->wireless_handlers = (struct iw_handler_def *)&wlcompat_handler_def;
dev->get_wireless_stats = wlcompat_get_wireless_stats;
#ifdef DEBUG #ifdef DEBUG
printk("broadcom driver private data: 0x%08x\n", dev->priv); printk("broadcom driver private data: 0x%08x\n", dev->priv);
#endif #endif
@ -954,6 +988,7 @@ static int __init wlcompat_init()
static void __exit wlcompat_exit() static void __exit wlcompat_exit()
{ {
dev->get_wireless_stats = NULL;
dev->wireless_handlers = NULL; dev->wireless_handlers = NULL;
dev->do_ioctl = old_ioctl; dev->do_ioctl = old_ioctl;
return; return;