Ticket #4360: mac80211_use_compat-wireless-2.6-old.patch

File mac80211_use_compat-wireless-2.6-old.patch, 7.4 KB (added by jal2@…, 9 years ago)

Let mac80211 use compat-wireless-2.6-old. Signed-off-by: Joerg Albert <jal2 at gmx.de>

  • package/mac80211/patches-old/001-disable_drivers.patch

     
    1 --- compat-wireless-2008-08-06/config.mk        2008-07-18 06:11:03.000000000 +0200 
    2 +++ compat-wireless-2008-08-06.new/config.mk    2008-11-28 21:10:31.000000000 +0100 
    3 @@ -72,70 +72,34 @@ 
    4  CONFIG_ATH5K=m 
    5  CONFIG_ATH5K_DEBUG=n 
    6   
    7 -# Required for older kernels which still use this flag. 
    8 -CONFIG_IWLWIFI=m 
    9 - 
    10 -CONFIG_IWLCORE=m 
    11 -CONFIG_IWL3945=m 
    12 -CONFIG_IWL4965=m 
    13 -CONFIG_IWL4965_HT=y 
    14 -CONFIG_B43=m 
    15 +# CONFIG_B43=m 
    16 +CONFIG_B43_NPHY=y 
    17  # B43 uses PCMCIA only for Compact Flash. The Cardbus cards uses PCI 
    18  # Example, bcm4318: 
    19  # http://www.multicap.biz/wireless-lan/indoor-wlan-hardware/sdc-cf10g-80211g-compact-flash-module 
    20 -CONFIG_B43_PCMCIA=y 
    21 +# CONFIG_B43_PCMCIA=y 
    22  CONFIG_B43_DMA=y 
     1--- compat-wireless-2.6-old.orig/config.mk      2008-09-27 01:19:22.000000000 +0200 
     2+++ compat-wireless-2.6-old/config.mk   2008-12-11 18:57:12.000000000 +0100 
     3@@ -109,7 +109,7 @@ CONFIG_B43=m 
     4 ifneq ($(CONFIG_PCMCIA),) 
     5 CONFIG_B43_PCMCIA=y 
     6 endif 
    237-CONFIG_B43_PIO=y 
    24 +# CONFIG_B43_PIO=y 
     8+#CONFIG_B43_PIO=y 
    259 # B43_PIO selects SSB_BLOCKIO 
    26 -CONFIG_SSB_BLOCKIO=y 
    27 -CONFIG_B43_DMA_AND_PIO_MODE=y 
    28 -CONFIG_B43_PCI_AUTOSELECT=y 
    29 -CONFIG_B43_PCICORE_AUTOSELECT=y 
    30 -#CONFIG_B43_RFKILL=n 
    31 -CONFIG_B43_LEDS=y 
    32 +# CONFIG_SSB_BLOCKIO=y 
    33 +# CONFIG_B43_DMA_AND_PIO_MODE=y 
    34 +# CONFIG_B43_PCI_AUTOSELECT=y 
    35 +# CONFIG_B43_PCICORE_AUTOSELECT=y 
    36 +# CONFIG_B43_RFKILL=y 
    37 +# CONFIG_B43_LEDS=y 
    38  # CONFIG_B43_DEBUG is not set 
    39   
    40 -CONFIG_B43LEGACY=m 
    41 -CONFIG_B43LEGACY_PCI_AUTOSELECT=y 
    42 -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y 
    43 +# CONFIG_B43LEGACY=m 
    44 +# CONFIG_B43LEGACY_RFKILL=y 
    45 +# CONFIG_B43LEGACY_LEDS=y 
    46 +# CONFIG_B43LEGACY_PCI_AUTOSELECT=y 
    47 +# CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y 
    48  CONFIG_B43LEGACY_DMA=y 
    49 -CONFIG_B43LEGACY_PIO=y 
    50 -CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y 
    51 - 
    52 -# The Intel ipws 
    53 -CONFIG_IPW2100=m 
    54 -CONFIG_IPW2100_MONITOR=y 
    55 -CONFIG_IPW2200=m 
    56 -CONFIG_IPW2200_MONITOR=y 
    57 -CONFIG_IPW2200_RADIOTAP=y 
    58 -CONFIG_IPW2200_PROMISCUOUS=y 
    59 -# The above enables use a second interface prefixed 'rtap'. 
    60 -#           Example usage: 
    61 -# 
    62 -# % modprobe ipw2200 rtap_iface=1 
    63 -# % ifconfig rtap0 up 
    64 -# % tethereal -i rtap0 
    65 -# 
    66 -# If you do not specify 'rtap_iface=1' as a module parameter then 
    67 -# the rtap interface will not be created and you will need to turn 
    68 -# it on via sysfs: 
    69 -# 
    70 -# % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface 
    71 -CONFIG_IPW2200_QOS=y 
    72 - 
    73 -NEED_IEEE80211=y 
    74 +# CONFIG_B43LEGACY_PIO=y 
    75 +# CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y 
    76   
    77  CONFIG_P54_PCI=m 
    78   
    79 -CONFIG_SSB_PCIHOST_POSSIBLE=y 
    80 -CONFIG_SSB_PCIHOST=y 
    81 -CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y 
    82 -CONFIG_SSB_DRIVER_PCICORE=y 
    83 -CONFIG_SSB_B43_PCI_BRIDGE=y 
    84 - 
    85 -CONFIG_RTL8180=m 
    86 -CONFIG_ADM8211=m 
    87 - 
    88  CONFIG_RT2X00_LIB_PCI=m 
    89  CONFIG_RT2400PCI=m 
    90  CONFIG_RT2500PCI=m 
    91 @@ -159,31 +123,7 @@ 
    92  ifneq ($(CONFIG_USB),) 
    93  CONFIG_ZD1211RW=m 
    94   
    95 -# support for USB Wireless devices using Atmel at76c503, 
    96 -# at76c505 or at76c505a chips. 
    97 -CONFIG_USB_ATMEL=m 
    98 - 
    99 -# Stuff here things which depend on kernel versions for USB 
    100 -ifeq ($(shell test -e $(KLIB_BUILD)/Makefile && echo yes),yes) 
    101 -KERNEL_SUBLEVEL = $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p') 
    102 -ifeq ($(shell test $(KERNEL_SUBLEVEL) -gt 21 && echo yes),yes) 
    103 - 
    104 -# Sorry, rndis_wlan uses cancel_work_sync which is new and can't be done in compat... 
    105 - 
    106 -# Wireless RNDIS USB support (RTL8185 802.11g) A-Link WL54PC 
    107 -# All of these devices are based on Broadcom 4320 chip which 
    108 -# is only wireless RNDIS chip known to date. 
    109 -# Note: this depends on CONFIG_USB_NET_RNDIS_HOST and CONFIG_USB_NET_CDCETHER 
    110 -# it also requires new RNDIS_HOST and CDC_ETHER modules which we add 
    111 -CONFIG_USB_NET_RNDIS_HOST=m 
    112 -CONFIG_USB_NET_RNDIS_WLAN=m 
    113 -CONFIG_USB_NET_CDCETHER=m 
    114 - 
    115 -endif 
    116 -endif 
    117 - 
    118  CONFIG_P54_USB=m 
    119 -CONFIG_RTL8187=m 
    120   
    121  # RT2500USB does not require firmware 
    122  CONFIG_RT2500USB=m 
    123 @@ -212,36 +152,6 @@ 
    124  # p54 
    125  CONFIG_P54_COMMON=m 
    126   
    127 -# Sonics Silicon Backplane 
    128 -CONFIG_SSB_POSSIBLE=y 
    129 -CONFIG_SSB=m 
    130 -CONFIG_SSB_SPROM=y 
    131 - 
    132 -ifneq ($(CONFIG_PCMCIA),) 
    133 -CONFIG_SSB_PCMCIAHOST=y 
    134 -endif 
    135 - 
    136 -# These two are for mips 
    137 -CONFIG_SSB_DRIVER_MIPS=n 
    138 -CONFIG_SSB_PCICORE_HOSTMODE=n 
    139 -# CONFIG_SSB_DEBUG is not set 
    140 -# CONFIG_SSB_DRIVER_EXTIF=y 
    141 - 
    142 -ifneq ($(CONFIG_USB),) 
    143 -CONFIG_LIBERTAS_USB=m 
    144 -NEED_LIBERTAS=y 
    145 -endif 
    146 -ifneq ($(CONFIG_PCMCIA),) 
    147 -CONFIG_LIBERTAS_CS=m 
    148 -NEED_LIBERTAS=y 
    149 -endif 
    150 -ifeq ($(NEED_LIBERTAS),y) 
    151 -CONFIG_LIBERTAS=m 
    152 -# Libertas uses the old stack but not fully, it will soon  
    153 -# be cleaned. 
    154 -NEED_IEEE80211=y 
    155 -endif 
    156 - 
    157  ifeq ($(NEED_IEEE80211),y) 
    158  # Old ieee80211 "stack" 
    159  # Note: old softmac is scheduled for removal so we 
     10 CONFIG_SSB_BLOCKIO=y 
     11 CONFIG_B43_PCI_AUTOSELECT=y 
  • package/mac80211/patches-old/004-allow-ap-vlan-modes.patch

     
    1 Subject: mac80211: allow AP and VLAN modes 
    2  
    3 This patch allows switching interfaces into AP/VLAN modes using 
    4 cfg80211 (nl80211). Don't allow doing it with wext because then 
    5 people will just attempt to do it manually (without hostapd) and 
    6 complain that it doesn't work. 
    7  
    8 Signed-off-by: Johannes Berg <johannes@sipsolutions.net> 
    9 --- 
    10  net/mac80211/cfg.c |    4 ++++ 
    11  1 file changed, 4 insertions(+) 
    12  
    13 --- everything.orig/net/mac80211/cfg.c  2008-08-06 21:38:13.000000000 +0200 
    14 +++ everything/net/mac80211/cfg.c       2008-08-06 21:38:24.000000000 +0200 
    15 @@ -33,6 +33,10 @@ nl80211_type_to_mac80211_type(enum nl802 
     1--- compat-wireless-2.6-old.orig/net/mac80211/cfg.c     2008-09-15 18:57:24.000000000 +0200 
     2+++ compat-wireless-2.6-old/net/mac80211/cfg.c  2008-12-13 16:07:29.000000000 +0100 
     3@@ -29,6 +29,8 @@ static bool nl80211_type_check(enum nl80 
    164        case NL80211_IFTYPE_MESH_POINT: 
    17                 return IEEE80211_IF_TYPE_MESH_POINT; 
    185 #endif 
     6        case NL80211_IFTYPE_WDS: 
    197+       case NL80211_IFTYPE_AP: 
    20 +               return IEEE80211_IF_TYPE_AP; 
    218+       case NL80211_IFTYPE_AP_VLAN: 
    22 +               return IEEE80211_IF_TYPE_VLAN; 
    23         case NL80211_IFTYPE_WDS: 
    24                 return IEEE80211_IF_TYPE_WDS; 
     9                return true; 
    2510        default: 
     11                return false; 
  • package/mac80211/Makefile

     
    1515ifneq ($(CONFIG_LINUX_2_6_27),) 
    1616  PKG_VERSION:=2008-11-29 
    1717  PKG_SOURCE_URL:=http://wireless.kernel.org/download/compat-wireless-2.6/ 
     18  PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2 
     19  PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION) 
    1820else 
    19   PKG_VERSION:=2008-08-06 
    20   PKG_SOURCE_URL:=http://www.orbit-lab.org/kernel/compat-wireless-2.6/2008/08 
     21  PKG_VERSION:=2008-12-03 
     22  PKG_SOURCE_URL:=http://www.orbit-lab.org/kernel/compat-wireless-2.6/2008/12/ 
     23  PKG_SOURCE:=compat-wireless-old-$(PKG_VERSION).tar.bz2 
     24  PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-2.6-old 
    2125  PATCH_DIR:=./patches-old 
    2226endif 
    2327 
    24 PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2 
    25 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION) 
    2628 
    2729include $(INCLUDE_DIR)/package.mk 
    2830STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_kmod-mac80211)