From 9bd0a4d89230748487540da80a1b14a3cc20a3e6 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 20 Nov 2008 15:01:15 -0800 Subject: [PATCH] New dir for Intel Centrino/minstrel is default - Intel Centrino wireless (ipw2100, ipw2200) drivers get new directory - Old Intel ieee80211 framework replaced by lib80211 and LIBIPW - minstrel is default default rate control algorithm now as it is now in the wireless-testing tree - removed some unused config symbols Signed-off-by: Hauke Mehrtens Signed-off-by: Luis R. Rodriguez --- Makefile | 15 +++++++-------- compat/compat.diff | 11 +++++++---- config.mk | 24 ++++++++---------------- scripts/admin-update.sh | 9 ++++----- 4 files changed, 26 insertions(+), 33 deletions(-) diff --git a/Makefile b/Makefile index c916737c825e..6a5eff4838fa 100644 --- a/Makefile +++ b/Makefile @@ -20,8 +20,7 @@ NOSTDINC_FLAGS := -I$(M)/include/ -include $(M)/include/net/compat.h $(CFLAGS) obj-y := net/wireless/ net/mac80211/ ifeq ($(ONLY_CORE),) obj-$(CONFIG_B44) += drivers/net/b44.o -obj-y += net/ieee80211/ \ - drivers/ssb/ \ +obj-y += drivers/ssb/ \ drivers/misc/ \ drivers/net/usb/ \ drivers/net/wireless/ @@ -95,7 +94,6 @@ install: uninstall modules @echo "Currently detected wireless subsystem modules:" @echo @$(MODPROBE) -l mac80211 - @# rc80211_simple is a module only on 2.6.22 and 2.6.23 @$(MODPROBE) -l cfg80211 @$(MODPROBE) -l lib80211 @$(MODPROBE) -l adm8211 @@ -110,8 +108,9 @@ install: uninstall modules @$(MODPROBE) -l iwlagn @$(MODPROBE) -l ipw2100 @$(MODPROBE) -l ipw2200 - @$(MODPROBE) -l ieee80211 - @$(MODPROBE) -l ieee80211_crypt + @$(MODPROBE) -l libipw + @$(MODPROBE) -l lib80211 + @$(MODPROBE) -l lib80211_crypt @$(MODPROBE) -l libertas_cs @$(MODPROBE) -l libertas_tf @$(MODPROBE) -l libertas_tf_usb @@ -144,7 +143,6 @@ uninstall: @# New location, matches upstream @rm -rf $(KLIB)/$(KMODDIR)/net/mac80211/ @rm -rf $(KLIB)/$(KMODDIR)/net/wireless/ - @rm -rf $(KLIB)/$(KMODDIR)/net/ieee80211/ @rm -rf $(KLIB)/$(KMODDIR)/drivers/ssb/ @rm -rf $(KLIB)/$(KMODDIR)/drivers/net/usb/ @rm -rf $(KLIB)/$(KMODDIR)/drivers/net/wireless/ @@ -171,8 +169,9 @@ uninstall: @$(MODPROBE) -l iwlagn @$(MODPROBE) -l ipw2100 @$(MODPROBE) -l ipw2200 - @$(MODPROBE) -l ieee80211 - @$(MODPROBE) -l ieee80211_crypt + @$(MODPROBE) -l libipw + @$(MODPROBE) -l lib80211 + @$(MODPROBE) -l lib80211_crypt @$(MODPROBE) -l libertas_cs @$(MODPROBE) -l libertas_tf @$(MODPROBE) -l libertas_tf_usb diff --git a/compat/compat.diff b/compat/compat.diff index 48fa75278179..c0a417811e76 100644 --- a/compat/compat.diff +++ b/compat/compat.diff @@ -10,10 +10,13 @@ * 802.11 configuration in-kernel interface --- a/net/wireless/Makefile 2008-10-27 19:54:52.000000000 +0100 +++ b/net/wireless/Makefile 2008-10-27 19:54:53.000000000 +0100 -@@ -1,6 +1,5 @@ +@@ -1,9 +1,8 @@ -obj-$(CONFIG_WIRELESS_EXT) += wext.o obj-$(CONFIG_CFG80211) += cfg80211.o obj-$(CONFIG_LIB80211) += lib80211.o + obj-$(CONFIG_LIB80211_CRYPT_WEP) += lib80211_crypt_wep.o + obj-$(CONFIG_LIB80211_CRYPT_CCMP) += lib80211_crypt_ccmp.o + obj-$(CONFIG_LIB80211_CRYPT_TKIP) += lib80211_crypt_tkip.o -cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o +cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o compat.o @@ -177,9 +180,9 @@ index a0c860f..9c6f214 100644 * there is one. --- a/drivers/net/wireless/Makefile 2008-11-10 12:55:55.000000000 -0800 +++ b/drivers/net/wireless/Makefile 2008-11-10 12:57:30.000000000 -0800 -@@ -6,41 +6,14 @@ - - obj-$(CONFIG_IPW2200) += ipw2200.o +@@ -5,41 +5,14 @@ + obj-$(CONFIG_IPW2100) += ipw2x00/ + obj-$(CONFIG_IPW2200) += ipw2x00/ -obj-$(CONFIG_STRIP) += strip.o -obj-$(CONFIG_ARLAN) += arlan.o diff --git a/config.mk b/config.mk index 4f5a6b982604..d94a97691247 100644 --- a/config.mk +++ b/config.mk @@ -59,15 +59,21 @@ endif endif # build check endif # kernel Makefile check -CONFIG_MAC80211_RC_DEFAULT=pid +# choose between pid and minstrel as default rate control algorithm +CONFIG_MAC80211_RC_DEFAULT=minstrel CONFIG_MAC80211_RC_PID=y CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_LEDS=y # enable mesh networking too CONFIG_MAC80211_MESH=y CONFIG_CFG80211=m CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m + CONFIG_NL80211=y # We'll disable this as soon major distributions # start shipping this @@ -96,11 +102,9 @@ CONFIG_B43=m # Example, bcm4318: # http://www.multicap.biz/wireless-lan/indoor-wlan-hardware/sdc-cf10g-80211g-compact-flash-module CONFIG_B43_PCMCIA=y -CONFIG_B43_DMA=y CONFIG_B43_PIO=y # B43_PIO selects SSB_BLOCKIO CONFIG_SSB_BLOCKIO=y -CONFIG_B43_DMA_AND_PIO_MODE=y CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y #CONFIG_B43_RFKILL=n @@ -115,6 +119,7 @@ CONFIG_B43LEGACY_PIO=y CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y # The Intel ipws +CONFIG_LIBIPW=m CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y CONFIG_IPW2200=m @@ -135,8 +140,6 @@ CONFIG_IPW2200_PROMISCUOUS=y # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface CONFIG_IPW2200_QOS=y -NEED_IEEE80211=y - CONFIG_P54_PCI=m CONFIG_SSB_PCIHOST_POSSIBLE=y @@ -247,16 +250,5 @@ ifeq ($(NEED_LIBERTAS),y) CONFIG_LIBERTAS=m # Libertas uses the old stack but not fully, it will soon # be cleaned. -NEED_IEEE80211=y endif -ifeq ($(NEED_IEEE80211),y) -# Old ieee80211 "stack" -# Note: old softmac is scheduled for removal so we -# ignore that stuff -CONFIG_IEEE80211=m -CONFIG_IEEE80211_CRYPT_CCMP=m -CONFIG_IEEE80211_CRYPT_TKIP=m -CONFIG_IEEE80211_CRYPT_WEP=m -CONFIG_IEEE80211_SOFTMAC=n -endif diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh index dc0a6e2165ef..4544df76f2e7 100755 --- a/scripts/admin-update.sh +++ b/scripts/admin-update.sh @@ -24,12 +24,12 @@ INCLUDE_LINUX="$INCLUDE_LINUX pci_ids.h bitops.h eeprom_93cx6.h pm_qos_params.h" INCLUDE_LINUX_USB="usbnet.h rndis_host.h" # Stuff that should die or be merged, only ipw uses it -INCLUDE_NET_OLD="ieee80211.h ieee80211_crypt.h" +INCLUDE_NET_OLD="ieee80211.h" # The good new yummy stuff INCLUDE_NET="$INCLUDE_NET_OLD cfg80211.h ieee80211_radiotap.h iw_handler.h" INCLUDE_NET="$INCLUDE_NET mac80211.h wext.h wireless.h lib80211.h" -NET_DIRS="wireless mac80211 ieee80211" +NET_DIRS="wireless mac80211" # User exported this variable if [ -z $GIT_TREE ]; then GIT_TREE="/home/$USER/devel/wireless-testing/" @@ -59,16 +59,15 @@ DRIVERS="$DRIVERS drivers/net/wireless/libertas" DRIVERS="$DRIVERS drivers/net/wireless/p54" DRIVERS="$DRIVERS drivers/net/wireless/rtl818x" DRIVERS="$DRIVERS drivers/net/wireless/libertas_tf" +DRIVERS="$DRIVERS drivers/net/wireless/ipw2x00" # Drivers that belong the the wireless directory DRIVER_FILES="adm8211.c adm8211.h" -DRIVER_FILES="$DRIVER_FILES ipw2100.h ipw2100.c" -DRIVER_FILES="$DRIVER_FILES ipw2200.h ipw2200.c" DRIVER_FILES="$DRIVER_FILES rndis_wlan.c" DRIVER_FILES="$DRIVER_FILES mac80211_hwsim.c" mkdir -p include/linux/ include/net/ include/linux/usb \ - net/mac80211/ net/wireless/ net/ieee80211/ \ + net/mac80211/ net/wireless/ \ drivers/ssb/ \ drivers/net/usb/ \ drivers/net/wireless/ -- 2.30.2