package/mac80211/diff.txt

   1 --- Makefile    2011-12-22 06:58:51.000000000 +0100
   2 +++ /Users/nbd/openwrt/package/mac80211/Makefile        2011-12-17 16:40:06.000000000 +0100
   3 @@ -49,7 +49,7 @@
   4    SUBMENU:=$(WMENU)
   5    URL:=http://linuxwireless.org/
   6    MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
   7 -  DEPENDS:=@(!(TARGET_avr32||TARGET_ep93xx)||BROKEN) @!LINUX_2_4
   8 +  DEPENDS:=@(!(TARGET_avr32||TARGET_ep93xx||TARGET_ps3||TARGET_pxcab||LINUX_3_2)||BROKEN)
   9  endef
  10
  11  define KernelPackage/cfg80211
  12 @@ -164,7 +164,7 @@
  13
  14  define KernelPackage/p54-common
  15    $(call KernelPackage/p54/Default)
  16 -  DEPENDS+= @PCI_SUPPORT||@USB_SUPPORT||@TARGET_omap24xx +kmod-mac80211 +kmod-crc-ccitt
  17 +  DEPENDS+= @PCI_SUPPORT||@USB_SUPPORT||@TARGET_omap24xx +kmod-mac80211 +kmod-lib-crc-ccitt
  18    TITLE+= (COMMON)
  19    FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54common.ko
  20    AUTOLOAD:=$(call AutoLoad,30,p54common)
  21 @@ -207,7 +207,7 @@
  22
  23  define KernelPackage/rt2x00-lib
  24  $(call KernelPackage/rt2x00/Default)
  25 -  DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT||TARGET_ramips) +kmod-mac80211 +kmod-crc-itu-t
  26 +  DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT||TARGET_ramips) +kmod-mac80211 +kmod-lib-crc-itu-t
  27    TITLE+= (LIB)
  28    FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00lib.ko
  29    AUTOLOAD:=$(call AutoLoad,25,rt2x00lib)
  30 @@ -308,7 +308,7 @@
  31
  32  define KernelPackage/rt2800-pci
  33  $(call KernelPackage/rt2x00/Default)
  34 -  DEPENDS+= @(PCI_SUPPORT||TARGET_ramips) +kmod-rt2x00-pci +kmod-rt2800-lib +kmod-crc-ccitt +TARGET_ramips:kmod-rt2x00-soc
  35 +  DEPENDS+= @(PCI_SUPPORT||TARGET_ramips) +kmod-rt2x00-pci +kmod-rt2800-lib +kmod-lib-crc-ccitt +TARGET_ramips:kmod-rt2x00-soc
  36    TITLE+= (RT2860 PCI)
  37    FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800pci.ko
  38    AUTOLOAD:=$(call AutoLoad,28,rt2800pci)
  39 @@ -316,7 +316,7 @@
  40
  41  define KernelPackage/rt2800-usb
  42  $(call KernelPackage/rt2x00/Default)
  43 -  DEPENDS+= @USB_SUPPORT +kmod-rt2x00-usb +kmod-rt2800-lib +kmod-crc-ccitt
  44 +  DEPENDS+= @USB_SUPPORT +kmod-rt2x00-usb +kmod-rt2800-lib +kmod-lib-crc-ccitt
  45    TITLE+= (RT2870 USB)
  46    FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800usb.ko
  47    AUTOLOAD:=$(call AutoLoad,28,rt2800usb)
  48 @@ -859,6 +859,7 @@
  49
  50  define KernelPackage/b43
  51  $(call KernelPackage/b43-common)
  52 +  DEPENDS+= +@DRIVER_11N_SUPPORT +!TARGET_brcm47xx:kmod-bcma
  53    TITLE:=Broadcom 43xx wireless support
  54    FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/b43/b43.ko
  55    AUTOLOAD:=$(call AutoLoad,30,b43)
  56 @@ -938,7 +939,7 @@
  57         config B43_FW_SQUASH_COREREVS
  58                 string "Core revisions to include"
  59                 depends on B43_FW_SQUASH
  60 -               default "5,6,7,8,9,10,13,14,15"
  61 +               default "5,6,7,8,9,10,11,13,14,15,16"
  62                 help
  63                   This is a comma seperated list of core revision numbers.
  64
  65 @@ -951,7 +952,7 @@
  66         config B43_FW_SQUASH_PHYTYPES
  67                 string "PHY types to include"
  68                 depends on B43_FW_SQUASH
  69 -               default "G,LP"
  70 +               default "G,LP,N"
  71                 help
  72                   This is a comma seperated list of PHY types:
  73                     A  => A-PHY
  74 @@ -977,7 +978,6 @@
  75
  76         config PACKAGE_B43_PIO
  77                 bool "Enable support for PIO transfer mode"
  78 -               depends BROKEN
  79                 default n
  80                 help
  81                   Enable support for using PIO instead of DMA. Unless you have DMA
  82 @@ -1250,6 +1250,7 @@
  83         $(TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(ZD1211FW_NAME)-$(ZD1211FW_VERSION).tar.bz2
  84         $(TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(PKG_LINUX_FIRMWARE_SOURCE)
  85         rm -rf $(PKG_BUILD_DIR)/include/linux/ssb
  86 +       rm -rf $(PKG_BUILD_DIR)/include/linux/bcma
  87         rm -f $(PKG_BUILD_DIR)/include/net/ieee80211.h
  88  endef
  89