diff options
Diffstat (limited to 'drivers/staging/rtl8192u/ieee80211')
| -rw-r--r-- | drivers/staging/rtl8192u/ieee80211/Makefile | 16 | ||||
| -rw-r--r-- | drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/rtl8192u/ieee80211/Makefile b/drivers/staging/rtl8192u/ieee80211/Makefile index 71ca5d9..45704f8 100644 --- a/drivers/staging/rtl8192u/ieee80211/Makefile +++ b/drivers/staging/rtl8192u/ieee80211/Makefile @@ -5,22 +5,22 @@ MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/$(NIC_SELECT) CC = gcc ifneq ($(shell uname -r|cut -d. -f1,2), 2.4) -EXTRA_CFLAGS += -I$(TOPDIR)/drivers/net/wireless -EXTRA_CFLAGS += -O2 -EXTRA_CFLAGS += -DJACKSON_NEW_8187 -DJACKSON_NEW_RX +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) -EXTRA_CFLAGS += -DOPENSUSE_SLED +ccflags-y := -DOPENSUSE_SLED endif ifeq ($(NIC_SELECT),RTL8192U) -#EXTRA_CFLAGS += -DUSB_TX_DRIVER_AGGREGATION_ENABLE -#EXTRA_CFLAGS += -DUSB_RX_AGGREGATION_SUPPORT +#ccflags-y := -DUSB_TX_DRIVER_AGGREGATION_ENABLE +#ccflags-y := -DUSB_RX_AGGREGATION_SUPPORT endif -#EXTRA_CFLAGS += -DJOHN_NOCPY +#ccflags-y := -DJOHN_NOCPY #flags to enable or disble 80211D feature -EXTRA_CFLAGS += -DENABLE_DOT11D +ccflags-y += -DENABLE_DOT11D ieee80211-rsl-objs := ieee80211_rx.o \ ieee80211_softmac.o \ ieee80211_tx.o \ diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c index 192123fb..c8ca9d8 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c @@ -2391,7 +2391,7 @@ static inline void update_network(struct ieee80211_network *dst, if(src->wmm_param[0].ac_aci_acm_aifsn|| \ src->wmm_param[1].ac_aci_acm_aifsn|| \ src->wmm_param[2].ac_aci_acm_aifsn|| \ - src->wmm_param[1].ac_aci_acm_aifsn) { + src->wmm_param[3].ac_aci_acm_aifsn) { memcpy(dst->wmm_param, src->wmm_param, WME_AC_PRAM_LEN); } //dst->QoS_Enable = src->QoS_Enable; diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c index a2e84c5..bc8c425 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c @@ -449,7 +449,7 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee) }while(!ieee->channel_map[ch]); #endif - /* this fuction can be called in two situations + /* this function can be called in two situations * 1- We have switched to ad-hoc mode and we are * performing a complete syncro scan before conclude * there are no interesting cell and to create a |
