mirror of https://github.com/hak5/openwrt-owl.git
Felix Fietkau
parent
9b11d6fa98
commit
c5226c3687
|
|
@ -10,20 +10,12 @@ include $(INCLUDE_DIR)/kernel.mk
|
||||||
|
|
||||||
PKG_NAME:=mac80211
|
PKG_NAME:=mac80211
|
||||||
|
|
||||||
ifneq ($(CONFIG_LINUX_2_6_21)$(CONFIG_LINUX_2_6_25),)
|
|
||||||
PKG_VERSION:=2008-08-06
|
|
||||||
PKG_RELEASE:=2
|
|
||||||
PKG_SOURCE_URL:=http://www.orbit-lab.org/kernel/compat-wireless-2.6/2008/08
|
|
||||||
PKG_MD5SUM:=9563ceeed86bca0859ad5f010623277c
|
|
||||||
PATCH_DIR:=./patches-old
|
|
||||||
else
|
|
||||||
PKG_VERSION:=2009-08-20
|
PKG_VERSION:=2009-08-20
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
PKG_SOURCE_URL:= \
|
PKG_SOURCE_URL:= \
|
||||||
http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/08 \
|
http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/08 \
|
||||||
http://wireless.kernel.org/download/compat-wireless-2.6
|
http://wireless.kernel.org/download/compat-wireless-2.6
|
||||||
PKG_MD5SUM:=0b3919adf847a59478cc4fb58e1cb6ec
|
PKG_MD5SUM:=0b3919adf847a59478cc4fb58e1cb6ec
|
||||||
endif
|
|
||||||
|
|
||||||
PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2
|
PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2
|
||||||
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
|
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
|
||||||
|
|
@ -44,7 +36,7 @@ endef
|
||||||
define KernelPackage/mac80211
|
define KernelPackage/mac80211
|
||||||
$(call KernelPackage/mac80211/Default)
|
$(call KernelPackage/mac80211/Default)
|
||||||
TITLE:=Linux 802.11 Wireless Networking Stack
|
TITLE:=Linux 802.11 Wireless Networking Stack
|
||||||
DEPENDS+= +kmod-crypto-arc4 +kmod-crypto-aes +wireless-tools
|
DEPENDS+= +kmod-crypto-arc4 +kmod-crypto-aes +wireless-tools @!LINUX_2_6_21 @!LINUX_2_6_25
|
||||||
FILES:= \
|
FILES:= \
|
||||||
$(PKG_BUILD_DIR)/net/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
|
$(PKG_BUILD_DIR)/net/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
|
||||||
$(PKG_BUILD_DIR)/net/wireless/cfg80211.$(LINUX_KMOD_SUFFIX)
|
$(PKG_BUILD_DIR)/net/wireless/cfg80211.$(LINUX_KMOD_SUFFIX)
|
||||||
|
|
@ -211,7 +203,7 @@ endef
|
||||||
|
|
||||||
define KernelPackage/rt2800-pci
|
define KernelPackage/rt2800-pci
|
||||||
$(call KernelPackage/rt2x00/Default)
|
$(call KernelPackage/rt2x00/Default)
|
||||||
DEPENDS+= +kmod-rt2x00-pci +kmod-crc-ccitt @!LINUX_2_6_21&&!LINUX_2_6_25
|
DEPENDS+= +kmod-rt2x00-pci +kmod-crc-ccitt
|
||||||
TITLE+= (RT2860 PCI)
|
TITLE+= (RT2860 PCI)
|
||||||
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800pci.$(LINUX_KMOD_SUFFIX)
|
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800pci.$(LINUX_KMOD_SUFFIX)
|
||||||
AUTOLOAD:=$(call AutoLoad,27,rt2800pci)
|
AUTOLOAD:=$(call AutoLoad,27,rt2800pci)
|
||||||
|
|
@ -219,7 +211,7 @@ endef
|
||||||
|
|
||||||
define KernelPackage/rt2800-usb
|
define KernelPackage/rt2800-usb
|
||||||
$(call KernelPackage/rt2x00/Default)
|
$(call KernelPackage/rt2x00/Default)
|
||||||
DEPENDS+= +kmod-rt2x00-usb +kmod-crc-ccitt @!LINUX_2_6_21&&!LINUX_2_6_25
|
DEPENDS+= +kmod-rt2x00-usb +kmod-crc-ccitt
|
||||||
TITLE+= (RT2870 USB)
|
TITLE+= (RT2870 USB)
|
||||||
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800usb.$(LINUX_KMOD_SUFFIX)
|
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800usb.$(LINUX_KMOD_SUFFIX)
|
||||||
AUTOLOAD:=$(call AutoLoad,27,rt2800usb)
|
AUTOLOAD:=$(call AutoLoad,27,rt2800usb)
|
||||||
|
|
@ -229,7 +221,7 @@ define KernelPackage/rtl818x/Default
|
||||||
$(call KernelPackage/mac80211/Default)
|
$(call KernelPackage/mac80211/Default)
|
||||||
TITLE:=Realtek Drivers for RTL818x devices
|
TITLE:=Realtek Drivers for RTL818x devices
|
||||||
URL:=http://wireless.kernel.org/en/users/Drivers/rtl8187
|
URL:=http://wireless.kernel.org/en/users/Drivers/rtl8187
|
||||||
DEPENDS+= +kmod-eeprom-93cx6 +kmod-mac80211 @!LINUX_2_6_21&&!LINUX_2_6_25
|
DEPENDS+= +kmod-eeprom-93cx6 +kmod-mac80211
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define KernelPackage/rtl8180
|
define KernelPackage/rtl8180
|
||||||
|
|
@ -296,7 +288,7 @@ define KernelPackage/ath9k
|
||||||
$(call KernelPackage/mac80211/Default)
|
$(call KernelPackage/mac80211/Default)
|
||||||
TITLE:=Atheros 802.11n wireless cards support
|
TITLE:=Atheros 802.11n wireless cards support
|
||||||
URL:=http://linuxwireless.org/en/users/Drivers/ath9k
|
URL:=http://linuxwireless.org/en/users/Drivers/ath9k
|
||||||
DEPENDS+= +kmod-ath @!LINUX_2_6_21&&!LINUX_2_6_25
|
DEPENDS+= +kmod-ath
|
||||||
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k.$(LINUX_KMOD_SUFFIX)
|
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k.$(LINUX_KMOD_SUFFIX)
|
||||||
AUTOLOAD:=$(call AutoLoad,27,ath9k)
|
AUTOLOAD:=$(call AutoLoad,27,ath9k)
|
||||||
endef
|
endef
|
||||||
|
|
@ -393,7 +385,7 @@ define KernelPackage/b43-common
|
||||||
$(call KernelPackage/mac80211/Default)
|
$(call KernelPackage/mac80211/Default)
|
||||||
TITLE:=Generic stuff for Broadcom wireless devices
|
TITLE:=Generic stuff for Broadcom wireless devices
|
||||||
URL:=http://linuxwireless.org/en/users/Drivers/b43
|
URL:=http://linuxwireless.org/en/users/Drivers/b43
|
||||||
DEPENDS+= +kmod-mac80211 +!(TARGET_brcm47xx||TARGET_brcm63xx):kmod-ssb @!LINUX_2_6_21
|
DEPENDS+= +kmod-mac80211 +!(TARGET_brcm47xx||TARGET_brcm63xx):kmod-ssb
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define KernelPackage/b43
|
define KernelPackage/b43
|
||||||
|
|
|
||||||
|
|
@ -1,159 +0,0 @@
|
||||||
--- a/config.mk
|
|
||||||
+++ b/config.mk
|
|
||||||
@@ -72,70 +72,34 @@ ifneq ($(CONFIG_PCI),)
|
|
||||||
CONFIG_ATH5K=m
|
|
||||||
CONFIG_ATH5K_DEBUG=n
|
|
||||||
|
|
||||||
-# Required for older kernels which still use this flag.
|
|
||||||
-CONFIG_IWLWIFI=m
|
|
||||||
-
|
|
||||||
-CONFIG_IWLCORE=m
|
|
||||||
-CONFIG_IWL3945=m
|
|
||||||
-CONFIG_IWL4965=m
|
|
||||||
-CONFIG_IWL4965_HT=y
|
|
||||||
-CONFIG_B43=m
|
|
||||||
+# CONFIG_B43=m
|
|
||||||
+CONFIG_B43_NPHY=y
|
|
||||||
# B43 uses PCMCIA only for Compact Flash. The Cardbus cards uses PCI
|
|
||||||
# Example, bcm4318:
|
|
||||||
# http://www.multicap.biz/wireless-lan/indoor-wlan-hardware/sdc-cf10g-80211g-compact-flash-module
|
|
||||||
-CONFIG_B43_PCMCIA=y
|
|
||||||
+# CONFIG_B43_PCMCIA=y
|
|
||||||
CONFIG_B43_DMA=y
|
|
||||||
-CONFIG_B43_PIO=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
|
|
||||||
-CONFIG_B43_LEDS=y
|
|
||||||
+# CONFIG_SSB_BLOCKIO=y
|
|
||||||
+# CONFIG_B43_DMA_AND_PIO_MODE=y
|
|
||||||
+# CONFIG_B43_PCI_AUTOSELECT=y
|
|
||||||
+# CONFIG_B43_PCICORE_AUTOSELECT=y
|
|
||||||
+# CONFIG_B43_RFKILL=y
|
|
||||||
+# CONFIG_B43_LEDS=y
|
|
||||||
# CONFIG_B43_DEBUG is not set
|
|
||||||
|
|
||||||
-CONFIG_B43LEGACY=m
|
|
||||||
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
|
|
||||||
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
|
|
||||||
+# CONFIG_B43LEGACY=m
|
|
||||||
+# CONFIG_B43LEGACY_RFKILL=y
|
|
||||||
+# CONFIG_B43LEGACY_LEDS=y
|
|
||||||
+# CONFIG_B43LEGACY_PCI_AUTOSELECT=y
|
|
||||||
+# CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
|
|
||||||
CONFIG_B43LEGACY_DMA=y
|
|
||||||
-CONFIG_B43LEGACY_PIO=y
|
|
||||||
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
|
|
||||||
-
|
|
||||||
-# The Intel ipws
|
|
||||||
-CONFIG_IPW2100=m
|
|
||||||
-CONFIG_IPW2100_MONITOR=y
|
|
||||||
-CONFIG_IPW2200=m
|
|
||||||
-CONFIG_IPW2200_MONITOR=y
|
|
||||||
-CONFIG_IPW2200_RADIOTAP=y
|
|
||||||
-CONFIG_IPW2200_PROMISCUOUS=y
|
|
||||||
-# The above enables use a second interface prefixed 'rtap'.
|
|
||||||
-# Example usage:
|
|
||||||
-#
|
|
||||||
-# % modprobe ipw2200 rtap_iface=1
|
|
||||||
-# % ifconfig rtap0 up
|
|
||||||
-# % tethereal -i rtap0
|
|
||||||
-#
|
|
||||||
-# If you do not specify 'rtap_iface=1' as a module parameter then
|
|
||||||
-# the rtap interface will not be created and you will need to turn
|
|
||||||
-# it on via sysfs:
|
|
||||||
-#
|
|
||||||
-# % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
|
|
||||||
-CONFIG_IPW2200_QOS=y
|
|
||||||
-
|
|
||||||
-NEED_IEEE80211=y
|
|
||||||
+# CONFIG_B43LEGACY_PIO=y
|
|
||||||
+# CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
|
|
||||||
|
|
||||||
CONFIG_P54_PCI=m
|
|
||||||
|
|
||||||
-CONFIG_SSB_PCIHOST_POSSIBLE=y
|
|
||||||
-CONFIG_SSB_PCIHOST=y
|
|
||||||
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
|
|
||||||
-CONFIG_SSB_DRIVER_PCICORE=y
|
|
||||||
-CONFIG_SSB_B43_PCI_BRIDGE=y
|
|
||||||
-
|
|
||||||
-CONFIG_RTL8180=m
|
|
||||||
-CONFIG_ADM8211=m
|
|
||||||
-
|
|
||||||
CONFIG_RT2X00_LIB_PCI=m
|
|
||||||
CONFIG_RT2400PCI=m
|
|
||||||
CONFIG_RT2500PCI=m
|
|
||||||
@@ -159,31 +123,7 @@ CONFIG_EEPROM_93CX6=m
|
|
||||||
ifneq ($(CONFIG_USB),)
|
|
||||||
CONFIG_ZD1211RW=m
|
|
||||||
|
|
||||||
-# support for USB Wireless devices using Atmel at76c503,
|
|
||||||
-# at76c505 or at76c505a chips.
|
|
||||||
-CONFIG_USB_ATMEL=m
|
|
||||||
-
|
|
||||||
-# Stuff here things which depend on kernel versions for USB
|
|
||||||
-ifeq ($(shell test -e $(KLIB_BUILD)/Makefile && echo yes),yes)
|
|
||||||
-KERNEL_SUBLEVEL = $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p')
|
|
||||||
-ifeq ($(shell test $(KERNEL_SUBLEVEL) -gt 21 && echo yes),yes)
|
|
||||||
-
|
|
||||||
-# Sorry, rndis_wlan uses cancel_work_sync which is new and can't be done in compat...
|
|
||||||
-
|
|
||||||
-# Wireless RNDIS USB support (RTL8185 802.11g) A-Link WL54PC
|
|
||||||
-# All of these devices are based on Broadcom 4320 chip which
|
|
||||||
-# is only wireless RNDIS chip known to date.
|
|
||||||
-# Note: this depends on CONFIG_USB_NET_RNDIS_HOST and CONFIG_USB_NET_CDCETHER
|
|
||||||
-# it also requires new RNDIS_HOST and CDC_ETHER modules which we add
|
|
||||||
-CONFIG_USB_NET_RNDIS_HOST=m
|
|
||||||
-CONFIG_USB_NET_RNDIS_WLAN=m
|
|
||||||
-CONFIG_USB_NET_CDCETHER=m
|
|
||||||
-
|
|
||||||
-endif
|
|
||||||
-endif
|
|
||||||
-
|
|
||||||
CONFIG_P54_USB=m
|
|
||||||
-CONFIG_RTL8187=m
|
|
||||||
|
|
||||||
# RT2500USB does not require firmware
|
|
||||||
CONFIG_RT2500USB=m
|
|
||||||
@@ -212,36 +152,6 @@ endif
|
|
||||||
# p54
|
|
||||||
CONFIG_P54_COMMON=m
|
|
||||||
|
|
||||||
-# Sonics Silicon Backplane
|
|
||||||
-CONFIG_SSB_POSSIBLE=y
|
|
||||||
-CONFIG_SSB=m
|
|
||||||
-CONFIG_SSB_SPROM=y
|
|
||||||
-
|
|
||||||
-ifneq ($(CONFIG_PCMCIA),)
|
|
||||||
-CONFIG_SSB_PCMCIAHOST=y
|
|
||||||
-endif
|
|
||||||
-
|
|
||||||
-# These two are for mips
|
|
||||||
-CONFIG_SSB_DRIVER_MIPS=n
|
|
||||||
-CONFIG_SSB_PCICORE_HOSTMODE=n
|
|
||||||
-# CONFIG_SSB_DEBUG is not set
|
|
||||||
-# CONFIG_SSB_DRIVER_EXTIF=y
|
|
||||||
-
|
|
||||||
-ifneq ($(CONFIG_USB),)
|
|
||||||
-CONFIG_LIBERTAS_USB=m
|
|
||||||
-NEED_LIBERTAS=y
|
|
||||||
-endif
|
|
||||||
-ifneq ($(CONFIG_PCMCIA),)
|
|
||||||
-CONFIG_LIBERTAS_CS=m
|
|
||||||
-NEED_LIBERTAS=y
|
|
||||||
-endif
|
|
||||||
-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
|
|
||||||
|
|
@ -1,292 +0,0 @@
|
||||||
This patch backports the interface of the b43 and b43legacy driver from
|
|
||||||
the new to the old ssb API. This patch is needed as long the old ssb
|
|
||||||
version is used in the kernel for broadcom devices. After upgrading to
|
|
||||||
ssb version out of kernel 2.6.27 or later this patch is not needed any more.
|
|
||||||
|
|
||||||
--- a/drivers/net/wireless/b43/dma.c
|
|
||||||
+++ b/drivers/net/wireless/b43/dma.c
|
|
||||||
@@ -328,11 +328,11 @@ static inline
|
|
||||||
dma_addr_t dmaaddr;
|
|
||||||
|
|
||||||
if (tx) {
|
|
||||||
- dmaaddr = ssb_dma_map_single(ring->dev->dev,
|
|
||||||
- buf, len, DMA_TO_DEVICE);
|
|
||||||
+ dmaaddr = dma_map_single(ring->dev->dev->dma_dev,
|
|
||||||
+ buf, len, DMA_TO_DEVICE);
|
|
||||||
} else {
|
|
||||||
- dmaaddr = ssb_dma_map_single(ring->dev->dev,
|
|
||||||
- buf, len, DMA_FROM_DEVICE);
|
|
||||||
+ dmaaddr = dma_map_single(ring->dev->dev->dma_dev,
|
|
||||||
+ buf, len, DMA_FROM_DEVICE);
|
|
||||||
}
|
|
||||||
|
|
||||||
return dmaaddr;
|
|
||||||
@@ -343,11 +343,11 @@ static inline
|
|
||||||
dma_addr_t addr, size_t len, int tx)
|
|
||||||
{
|
|
||||||
if (tx) {
|
|
||||||
- ssb_dma_unmap_single(ring->dev->dev,
|
|
||||||
- addr, len, DMA_TO_DEVICE);
|
|
||||||
+ dma_unmap_single(ring->dev->dev->dma_dev,
|
|
||||||
+ addr, len, DMA_TO_DEVICE);
|
|
||||||
} else {
|
|
||||||
- ssb_dma_unmap_single(ring->dev->dev,
|
|
||||||
- addr, len, DMA_FROM_DEVICE);
|
|
||||||
+ dma_unmap_single(ring->dev->dev->dma_dev,
|
|
||||||
+ addr, len, DMA_FROM_DEVICE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -356,8 +356,8 @@ static inline
|
|
||||||
dma_addr_t addr, size_t len)
|
|
||||||
{
|
|
||||||
B43_WARN_ON(ring->tx);
|
|
||||||
- ssb_dma_sync_single_for_cpu(ring->dev->dev,
|
|
||||||
- addr, len, DMA_FROM_DEVICE);
|
|
||||||
+ dma_sync_single_for_cpu(ring->dev->dev->dma_dev,
|
|
||||||
+ addr, len, DMA_FROM_DEVICE);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline
|
|
||||||
@@ -365,8 +365,8 @@ static inline
|
|
||||||
dma_addr_t addr, size_t len)
|
|
||||||
{
|
|
||||||
B43_WARN_ON(ring->tx);
|
|
||||||
- ssb_dma_sync_single_for_device(ring->dev->dev,
|
|
||||||
- addr, len, DMA_FROM_DEVICE);
|
|
||||||
+ dma_sync_single_for_device(ring->dev->dev->dma_dev,
|
|
||||||
+ addr, len, DMA_FROM_DEVICE);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline
|
|
||||||
@@ -381,6 +381,7 @@ static inline
|
|
||||||
|
|
||||||
static int alloc_ringmemory(struct b43_dmaring *ring)
|
|
||||||
{
|
|
||||||
+ struct device *dma_dev = ring->dev->dev->dma_dev;
|
|
||||||
gfp_t flags = GFP_KERNEL;
|
|
||||||
|
|
||||||
/* The specs call for 4K buffers for 30- and 32-bit DMA with 4K
|
|
||||||
@@ -391,14 +392,11 @@ static int alloc_ringmemory(struct b43_d
|
|
||||||
* For unknown reasons - possibly a hardware error - the BCM4311 rev
|
|
||||||
* 02, which uses 64-bit DMA, needs the ring buffer in very low memory,
|
|
||||||
* which accounts for the GFP_DMA flag below.
|
|
||||||
- *
|
|
||||||
- * The flags here must match the flags in free_ringmemory below!
|
|
||||||
*/
|
|
||||||
if (ring->type == B43_DMA_64BIT)
|
|
||||||
flags |= GFP_DMA;
|
|
||||||
- ring->descbase = ssb_dma_alloc_consistent(ring->dev->dev,
|
|
||||||
- B43_DMA_RINGMEMSIZE,
|
|
||||||
- &(ring->dmabase), flags);
|
|
||||||
+ ring->descbase = dma_alloc_coherent(dma_dev, B43_DMA_RINGMEMSIZE,
|
|
||||||
+ &(ring->dmabase), flags);
|
|
||||||
if (!ring->descbase) {
|
|
||||||
b43err(ring->dev->wl, "DMA ringmemory allocation failed\n");
|
|
||||||
return -ENOMEM;
|
|
||||||
@@ -410,13 +408,10 @@ static int alloc_ringmemory(struct b43_d
|
|
||||||
|
|
||||||
static void free_ringmemory(struct b43_dmaring *ring)
|
|
||||||
{
|
|
||||||
- gfp_t flags = GFP_KERNEL;
|
|
||||||
-
|
|
||||||
- if (ring->type == B43_DMA_64BIT)
|
|
||||||
- flags |= GFP_DMA;
|
|
||||||
+ struct device *dma_dev = ring->dev->dev->dma_dev;
|
|
||||||
|
|
||||||
- ssb_dma_free_consistent(ring->dev->dev, B43_DMA_RINGMEMSIZE,
|
|
||||||
- ring->descbase, ring->dmabase, flags);
|
|
||||||
+ dma_free_coherent(dma_dev, B43_DMA_RINGMEMSIZE,
|
|
||||||
+ ring->descbase, ring->dmabase);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Reset the RX DMA channel */
|
|
||||||
@@ -523,7 +518,7 @@ static bool b43_dma_mapping_error(struct
|
|
||||||
dma_addr_t addr,
|
|
||||||
size_t buffersize, bool dma_to_device)
|
|
||||||
{
|
|
||||||
- if (unlikely(ssb_dma_mapping_error(ring->dev->dev, addr)))
|
|
||||||
+ if (unlikely(dma_mapping_error(addr)))
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
switch (ring->type) {
|
|
||||||
@@ -849,10 +844,10 @@ struct b43_dmaring *b43_setup_dmaring(st
|
|
||||||
goto err_kfree_meta;
|
|
||||||
|
|
||||||
/* test for ability to dma to txhdr_cache */
|
|
||||||
- dma_test = ssb_dma_map_single(dev->dev,
|
|
||||||
- ring->txhdr_cache,
|
|
||||||
- b43_txhdr_size(dev),
|
|
||||||
- DMA_TO_DEVICE);
|
|
||||||
+ dma_test = dma_map_single(dev->dev->dma_dev,
|
|
||||||
+ ring->txhdr_cache,
|
|
||||||
+ b43_txhdr_size(dev),
|
|
||||||
+ DMA_TO_DEVICE);
|
|
||||||
|
|
||||||
if (b43_dma_mapping_error(ring, dma_test,
|
|
||||||
b43_txhdr_size(dev), 1)) {
|
|
||||||
@@ -864,10 +859,10 @@ struct b43_dmaring *b43_setup_dmaring(st
|
|
||||||
if (!ring->txhdr_cache)
|
|
||||||
goto err_kfree_meta;
|
|
||||||
|
|
||||||
- dma_test = ssb_dma_map_single(dev->dev,
|
|
||||||
- ring->txhdr_cache,
|
|
||||||
- b43_txhdr_size(dev),
|
|
||||||
- DMA_TO_DEVICE);
|
|
||||||
+ dma_test = dma_map_single(dev->dev->dma_dev,
|
|
||||||
+ ring->txhdr_cache,
|
|
||||||
+ b43_txhdr_size(dev),
|
|
||||||
+ DMA_TO_DEVICE);
|
|
||||||
|
|
||||||
if (b43_dma_mapping_error(ring, dma_test,
|
|
||||||
b43_txhdr_size(dev), 1)) {
|
|
||||||
@@ -878,9 +873,9 @@ struct b43_dmaring *b43_setup_dmaring(st
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- ssb_dma_unmap_single(dev->dev,
|
|
||||||
- dma_test, b43_txhdr_size(dev),
|
|
||||||
- DMA_TO_DEVICE);
|
|
||||||
+ dma_unmap_single(dev->dev->dma_dev,
|
|
||||||
+ dma_test, b43_txhdr_size(dev),
|
|
||||||
+ DMA_TO_DEVICE);
|
|
||||||
}
|
|
||||||
|
|
||||||
err = alloc_ringmemory(ring);
|
|
||||||
--- a/drivers/net/wireless/b43legacy/dma.c
|
|
||||||
+++ b/drivers/net/wireless/b43legacy/dma.c
|
|
||||||
@@ -393,13 +393,13 @@ dma_addr_t map_descbuffer(struct b43lega
|
|
||||||
dma_addr_t dmaaddr;
|
|
||||||
|
|
||||||
if (tx)
|
|
||||||
- dmaaddr = ssb_dma_map_single(ring->dev->dev,
|
|
||||||
- buf, len,
|
|
||||||
- DMA_TO_DEVICE);
|
|
||||||
+ dmaaddr = dma_map_single(ring->dev->dev->dma_dev,
|
|
||||||
+ buf, len,
|
|
||||||
+ DMA_TO_DEVICE);
|
|
||||||
else
|
|
||||||
- dmaaddr = ssb_dma_map_single(ring->dev->dev,
|
|
||||||
- buf, len,
|
|
||||||
- DMA_FROM_DEVICE);
|
|
||||||
+ dmaaddr = dma_map_single(ring->dev->dev->dma_dev,
|
|
||||||
+ buf, len,
|
|
||||||
+ DMA_FROM_DEVICE);
|
|
||||||
|
|
||||||
return dmaaddr;
|
|
||||||
}
|
|
||||||
@@ -411,13 +411,13 @@ void unmap_descbuffer(struct b43legacy_d
|
|
||||||
int tx)
|
|
||||||
{
|
|
||||||
if (tx)
|
|
||||||
- ssb_dma_unmap_single(ring->dev->dev,
|
|
||||||
- addr, len,
|
|
||||||
- DMA_TO_DEVICE);
|
|
||||||
+ dma_unmap_single(ring->dev->dev->dma_dev,
|
|
||||||
+ addr, len,
|
|
||||||
+ DMA_TO_DEVICE);
|
|
||||||
else
|
|
||||||
- ssb_dma_unmap_single(ring->dev->dev,
|
|
||||||
- addr, len,
|
|
||||||
- DMA_FROM_DEVICE);
|
|
||||||
+ dma_unmap_single(ring->dev->dev->dma_dev,
|
|
||||||
+ addr, len,
|
|
||||||
+ DMA_FROM_DEVICE);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline
|
|
||||||
@@ -427,8 +427,8 @@ void sync_descbuffer_for_cpu(struct b43l
|
|
||||||
{
|
|
||||||
B43legacy_WARN_ON(ring->tx);
|
|
||||||
|
|
||||||
- ssb_dma_sync_single_for_cpu(ring->dev->dev,
|
|
||||||
- addr, len, DMA_FROM_DEVICE);
|
|
||||||
+ dma_sync_single_for_cpu(ring->dev->dev->dma_dev,
|
|
||||||
+ addr, len, DMA_FROM_DEVICE);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline
|
|
||||||
@@ -438,8 +438,8 @@ void sync_descbuffer_for_device(struct b
|
|
||||||
{
|
|
||||||
B43legacy_WARN_ON(ring->tx);
|
|
||||||
|
|
||||||
- ssb_dma_sync_single_for_device(ring->dev->dev,
|
|
||||||
- addr, len, DMA_FROM_DEVICE);
|
|
||||||
+ dma_sync_single_for_device(ring->dev->dev->dma_dev,
|
|
||||||
+ addr, len, DMA_FROM_DEVICE);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline
|
|
||||||
@@ -458,11 +458,10 @@ void free_descriptor_buffer(struct b43le
|
|
||||||
|
|
||||||
static int alloc_ringmemory(struct b43legacy_dmaring *ring)
|
|
||||||
{
|
|
||||||
- /* GFP flags must match the flags in free_ringmemory()! */
|
|
||||||
- ring->descbase = ssb_dma_alloc_consistent(ring->dev->dev,
|
|
||||||
- B43legacy_DMA_RINGMEMSIZE,
|
|
||||||
- &(ring->dmabase),
|
|
||||||
- GFP_KERNEL);
|
|
||||||
+ struct device *dma_dev = ring->dev->dev->dma_dev;
|
|
||||||
+
|
|
||||||
+ ring->descbase = dma_alloc_coherent(dma_dev, B43legacy_DMA_RINGMEMSIZE,
|
|
||||||
+ &(ring->dmabase), GFP_KERNEL);
|
|
||||||
if (!ring->descbase) {
|
|
||||||
b43legacyerr(ring->dev->wl, "DMA ringmemory allocation"
|
|
||||||
" failed\n");
|
|
||||||
@@ -475,8 +474,10 @@ static int alloc_ringmemory(struct b43le
|
|
||||||
|
|
||||||
static void free_ringmemory(struct b43legacy_dmaring *ring)
|
|
||||||
{
|
|
||||||
- ssb_dma_free_consistent(ring->dev->dev, B43legacy_DMA_RINGMEMSIZE,
|
|
||||||
- ring->descbase, ring->dmabase, GFP_KERNEL);
|
|
||||||
+ struct device *dma_dev = ring->dev->dev->dma_dev;
|
|
||||||
+
|
|
||||||
+ dma_free_coherent(dma_dev, B43legacy_DMA_RINGMEMSIZE,
|
|
||||||
+ ring->descbase, ring->dmabase);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Reset the RX DMA channel */
|
|
||||||
@@ -588,7 +589,7 @@ static bool b43legacy_dma_mapping_error(
|
|
||||||
size_t buffersize,
|
|
||||||
bool dma_to_device)
|
|
||||||
{
|
|
||||||
- if (unlikely(ssb_dma_mapping_error(ring->dev->dev, addr)))
|
|
||||||
+ if (unlikely(dma_mapping_error(addr)))
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
switch (ring->type) {
|
|
||||||
@@ -905,9 +906,9 @@ struct b43legacy_dmaring *b43legacy_setu
|
|
||||||
goto err_kfree_meta;
|
|
||||||
|
|
||||||
/* test for ability to dma to txhdr_cache */
|
|
||||||
- dma_test = ssb_dma_map_single(dev->dev, ring->txhdr_cache,
|
|
||||||
- sizeof(struct b43legacy_txhdr_fw3),
|
|
||||||
- DMA_TO_DEVICE);
|
|
||||||
+ dma_test = dma_map_single(dev->dev->dma_dev, ring->txhdr_cache,
|
|
||||||
+ sizeof(struct b43legacy_txhdr_fw3),
|
|
||||||
+ DMA_TO_DEVICE);
|
|
||||||
|
|
||||||
if (b43legacy_dma_mapping_error(ring, dma_test,
|
|
||||||
sizeof(struct b43legacy_txhdr_fw3), 1)) {
|
|
||||||
@@ -919,7 +920,7 @@ struct b43legacy_dmaring *b43legacy_setu
|
|
||||||
if (!ring->txhdr_cache)
|
|
||||||
goto err_kfree_meta;
|
|
||||||
|
|
||||||
- dma_test = ssb_dma_map_single(dev->dev,
|
|
||||||
+ dma_test = dma_map_single(dev->dev->dma_dev,
|
|
||||||
ring->txhdr_cache,
|
|
||||||
sizeof(struct b43legacy_txhdr_fw3),
|
|
||||||
DMA_TO_DEVICE);
|
|
||||||
@@ -929,9 +930,9 @@ struct b43legacy_dmaring *b43legacy_setu
|
|
||||||
goto err_kfree_txhdr_cache;
|
|
||||||
}
|
|
||||||
|
|
||||||
- ssb_dma_unmap_single(dev->dev, dma_test,
|
|
||||||
- sizeof(struct b43legacy_txhdr_fw3),
|
|
||||||
- DMA_TO_DEVICE);
|
|
||||||
+ dma_unmap_single(dev->dev->dma_dev,
|
|
||||||
+ dma_test, sizeof(struct b43legacy_txhdr_fw3),
|
|
||||||
+ DMA_TO_DEVICE);
|
|
||||||
}
|
|
||||||
|
|
||||||
ring->nr_slots = nr_slots;
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
Subject: mac80211: allow AP and VLAN modes
|
|
||||||
|
|
||||||
This patch allows switching interfaces into AP/VLAN modes using
|
|
||||||
cfg80211 (nl80211). Don't allow doing it with wext because then
|
|
||||||
people will just attempt to do it manually (without hostapd) and
|
|
||||||
complain that it doesn't work.
|
|
||||||
|
|
||||||
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
|
|
||||||
---
|
|
||||||
net/mac80211/cfg.c | 4 ++++
|
|
||||||
1 file changed, 4 insertions(+)
|
|
||||||
|
|
||||||
--- a/net/mac80211/cfg.c
|
|
||||||
+++ b/net/mac80211/cfg.c
|
|
||||||
@@ -35,6 +35,10 @@ nl80211_type_to_mac80211_type(enum nl802
|
|
||||||
case NL80211_IFTYPE_MESH_POINT:
|
|
||||||
return IEEE80211_IF_TYPE_MESH_POINT;
|
|
||||||
#endif
|
|
||||||
+ case NL80211_IFTYPE_AP:
|
|
||||||
+ return IEEE80211_IF_TYPE_AP;
|
|
||||||
+ case NL80211_IFTYPE_AP_VLAN:
|
|
||||||
+ return IEEE80211_IF_TYPE_VLAN;
|
|
||||||
case NL80211_IFTYPE_WDS:
|
|
||||||
return IEEE80211_IF_TYPE_WDS;
|
|
||||||
default:
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -19,7 +19,6 @@ NOSTDINC_FLAGS := -I$(M)/include/ -inclu
|
|
||||||
obj-y := net/wireless/ net/mac80211/
|
|
||||||
ifeq ($(ONLY_CORE),)
|
|
||||||
obj-y += net/ieee80211/ \
|
|
||||||
- drivers/ssb/ \
|
|
||||||
drivers/misc/ \
|
|
||||||
drivers/net/usb/ \
|
|
||||||
drivers/net/wireless/
|
|
||||||
Loading…
Reference in New Issue