From e7549b926dd3ceec048f5689df90d4ec970c9419 Mon Sep 17 00:00:00 2001 From: Wolfgang Wiedmeyer Date: Fri, 23 Oct 2015 13:30:20 +0200 Subject: more driver stuff from 3.2.72 --- drivers/staging/rtl8192u/ieee80211/Makefile | 109 --------------------- drivers/staging/rtl8192u/ieee80211/compress.c | 4 +- drivers/staging/rtl8192u/ieee80211/ieee80211.h | 6 +- .../staging/rtl8192u/ieee80211/ieee80211_crypt.c | 1 - .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 1 - .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 1 - .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 1 - .../staging/rtl8192u/ieee80211/ieee80211_module.c | 3 +- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 1 - .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 21 ++-- drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 2 +- 11 files changed, 15 insertions(+), 135 deletions(-) (limited to 'drivers/staging/rtl8192u/ieee80211') diff --git a/drivers/staging/rtl8192u/ieee80211/Makefile b/drivers/staging/rtl8192u/ieee80211/Makefile index 0775c55..51effd6 100644 --- a/drivers/staging/rtl8192u/ieee80211/Makefile +++ b/drivers/staging/rtl8192u/ieee80211/Makefile @@ -1,25 +1,9 @@ NIC_SELECT = RTL8192U -KVER := $(shell uname -r) -MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/$(NIC_SELECT) - -CC = gcc -ifneq ($(shell uname -r|cut -d. -f1,2), 2.4) ccflags-y := -I$(TOPDIR)/drivers/net/wireless ccflags-y += -O2 ccflags-y += -DJACKSON_NEW_8187 -DJACKSON_NEW_RX -#it will fail to compile in suse linux enterprise 10 sp2. This flag is to solve this problem. -ifeq ($(shell uname -r | cut -d. -f1,2,3,4), 2.6.16.60-0) -ccflags-y := -DOPENSUSE_SLED -endif - -ifeq ($(NIC_SELECT),RTL8192U) -#ccflags-y := -DUSB_TX_DRIVER_AGGREGATION_ENABLE -#ccflags-y := -DUSB_RX_AGGREGATION_SUPPORT -endif -#ccflags-y := -DJOHN_NOCPY -#flags to enable or disble 80211D feature ieee80211-rsl-objs := ieee80211_rx.o \ ieee80211_softmac.o \ ieee80211_tx.o \ @@ -42,96 +26,3 @@ obj-m +=ieee80211_crypt_wep-rsl.o obj-m +=ieee80211_crypt_tkip-rsl.o obj-m +=ieee80211_crypt_ccmp-rsl.o -KSRC := /lib/modules/$(KVER)/build -INSTALL_PREFIX := - -all: modules - -modules: - $(MAKE) -C $(KSRC) M=$(PWD) CC=$(CC) modules - -install: modules - rm -fr $(MODDESTDIR) - mkdir -p $(MODDESTDIR) - @install -p -m 644 ieee80211_crypt-rsl.ko $(MODDESTDIR) - @install -p -m 644 ieee80211_crypt_wep-rsl.ko $(MODDESTDIR) - @install -p -m 644 ieee80211_crypt_tkip-rsl.ko $(MODDESTDIR) - @install -p -m 644 ieee80211_crypt_ccmp-rsl.ko $(MODDESTDIR) - @install -p -m 644 ieee80211-rsl.ko $(MODDESTDIR) - depmod -a -uninstall: - rm -fr $(MODDESTDIR) - depmod -a - -else -LD := ld -KSRC := /lib/modules/$(KVER)/build -CONFIG_FILE := $(KSRC)/include/linux/autoconf.h - -CFLAGS += -DLINUX -D__KERNEL__ -DMODULE -O2 -pipe -Wall -CFLAGS += -I$(KSRC)/include -I. -#Kernel 2.4.31 -CFLAGS += -DMODVERSIONS -DEXPORT_SYMTAB -include $(KSRC)/include/linux/modversions.h -#Kernel 2.4.20 -#CFLAGS += -D__NO_VERSION__ -DEXPORT_SYMTAB -SMP := $(shell $(CC) $(MODCFLAGS) -E -dM $(CONFIG_FILE) | \ - grep CONFIG_SMP | awk '{print $$3}') -ifneq ($(SMP),1) - SMP := 0 -endif -ifeq ($(SMP),1) - CFLAGS += -D__SMP__ -endif - -#CFLAGS += -DJOHN_NOCPY - -OBJS := ${patsubst %.c, %.o, ${wildcard *.c}} -all:${OBJS} ieee80211_crypt-rsl.o michael_mic-rsl.o aes-rsl.o ieee80211_crypt_wep-rsl.o ieee80211_crypt_tkip-rsl.o ieee80211_crypt_ccmp-rsl.o crypto-rsl.o ieee80211-rsl.o - -ieee80211_crypt-rsl.o: ieee80211_crypt.o - mv $^ $@ - -michael_mic-rsl.o: michael_mic.o - mv $^ $@ - -aes-rsl.o: aes.o - mv $^ $@ - -ieee80211_crypt_wep-rsl.o: ieee80211_crypt_wep.o - mv $^ $@ - -ieee80211_crypt_tkip-rsl.o: ieee80211_crypt_tkip.o - mv $^ $@ - -ieee80211_crypt_ccmp-rsl.o: ieee80211_crypt_ccmp.o - mv $^ $@ - -crypto-rsl.o: arc4.o api.o autoload.o cipher.o compress.o digest.o scatterwalk.o proc.o - $(LD) -r $^ -o $@ - -ieee80211-rsl.o: ieee80211_rx.o ieee80211_tx.o ieee80211_wx.o ieee80211_module.o ieee80211_softmac_wx.o ieee80211_softmac.o rtl819x_HTProc.o rtl819x_TSProc.o rtl819x_BAProc.o dot11d.o - $(LD) -r $^ -o $@ -install: - rm -fr $(MODDESTDIR) - mkdir -p $(MODDESTDIR) - @install -p -m 644 ieee80211_crypt-rsl.o $(MODDESTDIR) - @install -p -m 644 crypto-rsl.o $(MODDESTDIR) - @install -p -m 644 michael_mic-rsl.o $(MODDESTDIR) - @install -p -m 644 aes-rsl.o $(MODDESTDIR) - @install -p -m 644 ieee80211_crypt_wep-rsl.o $(MODDESTDIR) - @install -p -m 644 ieee80211_crypt_tkip-rsl.o $(MODDESTDIR) - @install -p -m 644 ieee80211_crypt_ccmp-rsl.o $(MODDESTDIR) - @install -p -m 644 ieee80211-rsl.o $(MODDESTDIR) - /sbin/depmod -a ${shell uname -r} - -uninstall: - rm -fr $(MODDESTDIR) - /sbin/depmod -a ${shell uname -r} - -endif - -.PHONY: clean -clean: - rm -fr *.mod.c *.mod *.o .*.cmd *.mod.* *.ko *.o *~ - rm -rf .tmp_versions - rm -rf Module.symvers diff --git a/drivers/staging/rtl8192u/ieee80211/compress.c b/drivers/staging/rtl8192u/ieee80211/compress.c index 86c23c9..5416ab6 100644 --- a/drivers/staging/rtl8192u/ieee80211/compress.c +++ b/drivers/staging/rtl8192u/ieee80211/compress.c @@ -12,10 +12,10 @@ * */ #include -//#include +/*#include */ #include "rtl_crypto.h" #include -#include +#include #include #include "internal.h" diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h index e716f7b..1c0a1db 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h @@ -25,12 +25,12 @@ #define IEEE80211_H #include /* ETH_ALEN */ #include /* ARRAY_SIZE */ -#include #include #include #include #include #include +#include #include #include @@ -2416,8 +2416,8 @@ extern int ieee80211_wx_set_mlme(struct ieee80211_device *ieee, extern int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len); /* ieee80211_softmac.c */ -extern short ieee80211_is_54g(struct ieee80211_network net); -extern short ieee80211_is_shortslot(struct ieee80211_network net); +extern short ieee80211_is_54g(const struct ieee80211_network *net); +extern short ieee80211_is_shortslot(const struct ieee80211_network *net); extern int ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb, struct ieee80211_rx_stats *rx_stats, u16 type, u16 stype); diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c index 8707eba..a464d11 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c @@ -12,7 +12,6 @@ */ //#include -#include #include #include #include diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c index 4b078e5..fec0176 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c @@ -10,7 +10,6 @@ */ //#include -#include #include #include #include diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c index a98584c..555eb80 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c @@ -10,7 +10,6 @@ */ //#include -#include #include #include #include diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c index 96c2c9d..3801f12 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c @@ -10,7 +10,6 @@ */ //#include -#include #include #include #include diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c index fe978f3..e3d47bc 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c @@ -46,7 +46,6 @@ #include #include #include -#include #include #include #include @@ -283,7 +282,7 @@ int __init ieee80211_debug_init(void) ieee80211_debug_level = debug; - ieee80211_proc = create_proc_entry(DRV_NAME, S_IFDIR, init_net.proc_net); + ieee80211_proc = proc_mkdir(DRV_NAME, init_net.proc_net); if (ieee80211_proc == NULL) { IEEE80211_ERROR("Unable to create " DRV_NAME " proc directory\n"); diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c index a414303..c9bdc7f 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c index 4ec0a65..c2ab5fa 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include "dot11d.h" @@ -32,14 +31,14 @@ u8 rsn_authen_cipher_suite[16][4] = { {0x00,0x0F,0xAC,0x05}, //WEP-104 }; -short ieee80211_is_54g(struct ieee80211_network net) +short ieee80211_is_54g(const struct ieee80211_network *net) { - return ((net.rates_ex_len > 0) || (net.rates_len > 4)); + return (net->rates_ex_len > 0) || (net->rates_len > 4); } -short ieee80211_is_shortslot(struct ieee80211_network net) +short ieee80211_is_shortslot(const struct ieee80211_network *net) { - return (net.capability & WLAN_CAPABILITY_SHORT_SLOT); + return net->capability & WLAN_CAPABILITY_SHORT_SLOT; } /* returns the total length needed for pleacing the RATE MFIE @@ -719,7 +718,7 @@ static struct sk_buff* ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d else atim_len = 0; - if(ieee80211_is_54g(ieee->current_network)) + if(ieee80211_is_54g(&ieee->current_network)) erp_len = 3; else erp_len = 0; @@ -777,7 +776,7 @@ static struct sk_buff* ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d cpu_to_le16(ieee->current_network.capability & WLAN_CAPABILITY_SHORT_PREAMBLE); //add short preamble here if(ieee->short_slot && (ieee->current_network.capability & WLAN_CAPABILITY_SHORT_SLOT)) - cpu_to_le16((beacon_buf->capability |= WLAN_CAPABILITY_SHORT_SLOT)); + beacon_buf->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT); crypt = ieee->crypt[ieee->tx_keyidx]; if (encrypt) @@ -1334,7 +1333,7 @@ void ieee80211_associate_complete_wq(struct work_struct *work) { struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, associate_complete_wq); printk(KERN_INFO "Associated successfully\n"); - if(ieee80211_is_54g(ieee->current_network) && + if(ieee80211_is_54g(&ieee->current_network) && (ieee->modulation & IEEE80211_OFDM_MODULATION)){ ieee->rate = 108; @@ -1490,7 +1489,7 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee ieee->state = IEEE80211_ASSOCIATING; queue_work(ieee->wq, &ieee->associate_procedure_wq); }else{ - if(ieee80211_is_54g(ieee->current_network) && + if(ieee80211_is_54g(&ieee->current_network) && (ieee->modulation & IEEE80211_OFDM_MODULATION)){ ieee->rate = 108; ieee->SetWirelessMode(ieee->dev, IEEE_G); @@ -2726,11 +2725,7 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee) ieee->beacon_timer.data = (unsigned long) ieee; ieee->beacon_timer.function = ieee80211_send_beacon_cb; -#ifdef PF_SYNCTHREAD - ieee->wq = create_workqueue(DRV_NAME,0); -#else ieee->wq = create_workqueue(DRV_NAME); -#endif INIT_DELAYED_WORK(&ieee->start_ibss_wq,ieee80211_start_ibss_wq); INIT_WORK(&ieee->associate_complete_wq, ieee80211_associate_complete_wq); diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c index ec7845e..59c45a5 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c @@ -723,7 +723,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) (CFG_IEEE80211_COMPUTE_FCS | CFG_IEEE80211_RESERVE_FCS)) bytes_per_frag -= IEEE80211_FCS_LEN; - /* Each fragment may need to have room for encryptiong pre/postfix */ + /* Each fragment may need to have room for encryption pre/postfix */ if (encrypt) bytes_per_frag -= crypt->ops->extra_prefix_len + crypt->ops->extra_postfix_len; -- cgit v1.1