mac80211: upgrade to wireless-testing 2010-09-14, replace the external carl9170 with the recently merged upstream version
SVN-Revision: 23061v19.07.3_mercusys_ac12_duma
Felix Fietkau
14 years ago
parent
9c2cfd7a1b
commit
fc7fbe8349
@ -1,90 +0,0 @@
|
||||
#
|
||||
# Copyright (C) 2010 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
include $(INCLUDE_DIR)/kernel.mk
|
||||
|
||||
PKG_NAME:=carl9170
|
||||
PKG_VERSION:=1.0.5.3
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||
PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/chr/carl9170/$(PKG_VERSION) \
|
||||
@KERNEL/linux/kernel/people/chr/carl9170/old/$(PKG_VERSION)
|
||||
PKG_MD5SUM:=91d714d1e5c5c62da1191ac5afd8bcb0
|
||||
|
||||
PKG_CONFIG_DEPENDS:= \
|
||||
CONFIG_PACKAGE_CARL9170_DEBUGFS \
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
DRV_PATH:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/carl9170
|
||||
|
||||
define KernelPackage/carl9170
|
||||
SUBMENU:=Wireless Drivers
|
||||
TITLE:=Driver for Atheros AR9170 USB sticks
|
||||
DEPENDS:=@USB_SUPPORT +kmod-mac80211 +kmod-ath +kmod-usb-core
|
||||
URL:=http://www.kernel.org/pub/linux/kernel/people/chr/carl9170
|
||||
FILES:=$(DRV_PATH)/carl9170usb.ko
|
||||
AUTOLOAD:=$(call AutoLoad,60,carl9170usb)
|
||||
MENU:=1
|
||||
endef
|
||||
|
||||
define KernelPackage/carl9170/config
|
||||
menu "Configuration"
|
||||
depends PACKAGE_kmod-carl9170
|
||||
|
||||
config PACKAGE_CARL9170_DEBUGFS
|
||||
bool "Enable Debugging (DebugFS) Support"
|
||||
depends PACKAGE_MAC80211_DEBUGFS
|
||||
help
|
||||
Say Y if you need access to carl9170usb's statistics for QoS queue
|
||||
status, rate control, etc...
|
||||
|
||||
endmenu
|
||||
endef
|
||||
|
||||
define KernelPackage/carl9170/description
|
||||
This package contains a driver for Atheros AR9170 USB sticks using the free firmware
|
||||
endef
|
||||
|
||||
define Build/Prepare
|
||||
rm -rf $(PKG_BUILD_DIR)
|
||||
mkdir -p $(PKG_BUILD_DIR)
|
||||
$(HOST_TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(PKG_SOURCE)
|
||||
$(HOST_TAR) -C $(PKG_BUILD_DIR) -xf $(PKG_BUILD_DIR)/$(PKG_VERSION)/driver/carl9170-driver-$(PKG_VERSION).tar
|
||||
ln -s $(STAGING_DIR)/usr/include/mac80211/ath/*.h $(PKG_BUILD_DIR)/drivers/net/wireless/ath/
|
||||
$(Build/Patch)
|
||||
endef
|
||||
|
||||
BUILDFLAGS = \
|
||||
CONFIG_CARL9170_USB=m \
|
||||
CONFIG_CARL9170_LEDS=$(if $(CONFIG_LEDS_TRIGGERS),y) \
|
||||
CONFIG_CARL9170_DEBUGFS=$(if $(CONFIG_PACKAGE_CARL9170_DEBUGFS),y) \
|
||||
CONFIG_MAC80211_DEBUGFS=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \
|
||||
|
||||
EXTRA_CFLAGS = \
|
||||
$(if $(CONFIG_ATH_USER_REGD),-DATH_USER_REGD) \
|
||||
$(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS -DCONFIG_CARL9170_LEDS) \
|
||||
$(if $(CONFIG_PACKAGE_CARL9170_DEBUGFS),-DCONFIG_CARL9170_DEBUGFS) \
|
||||
$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),-DCONFIG_MAC80211_DEBUGFS) \
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) -C $(LINUX_DIR) \
|
||||
SUBDIRS="$(DRV_PATH)" \
|
||||
ARCH="$(LINUX_KARCH)" \
|
||||
CROSS_COMPILE="$(KERNEL_CROSS)" \
|
||||
CC="$(TARGET_CC) -I$(STAGING_DIR)/usr/include/mac80211 $(EXTRA_CFLAGS)" \
|
||||
$(BUILDFLAGS)
|
||||
endef
|
||||
|
||||
define KernelPackage/carl9170/install
|
||||
$(INSTALL_DIR) $(1)/lib/firmware
|
||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_VERSION)/firmware_build/carl9170-1.fw $(1)/lib/firmware/
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,carl9170))
|
||||
@ -1,31 +0,0 @@
|
||||
--- a/drivers/net/wireless/ath/carl9170/usb.c
|
||||
+++ b/drivers/net/wireless/ath/carl9170/usb.c
|
||||
@@ -1000,11 +1000,28 @@ err_failed:
|
||||
ar9170_usb_firmware_failed(aru);
|
||||
}
|
||||
|
||||
+
|
||||
+
|
||||
static int ar9170_usb_request_firmware(struct ar9170_usb *aru)
|
||||
{
|
||||
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33))
|
||||
+ const struct firmware *fw;
|
||||
+ int ret;
|
||||
+
|
||||
+ ret = request_firmware(&fw,
|
||||
+ ar9170_fws[aru->fw_load].files[aru->fw_files].name,
|
||||
+ &aru->udev->dev);
|
||||
+
|
||||
+ if (ret < 0)
|
||||
+ return ret;
|
||||
+
|
||||
+ ar9170_usb_firmware_step2(fw, aru);
|
||||
+ return 0;
|
||||
+#else
|
||||
return request_firmware_nowait(THIS_MODULE, 1,
|
||||
ar9170_fws[aru->fw_load].files[aru->fw_files].name,
|
||||
&aru->udev->dev, GFP_KERNEL, aru, ar9170_usb_firmware_step2);
|
||||
+#endif
|
||||
}
|
||||
|
||||
static void ar9170_usb_disconnect(struct usb_interface *intf)
|
||||
@ -1,11 +0,0 @@
|
||||
--- a/drivers/net/wireless/ath/carl9170/main.c
|
||||
+++ b/drivers/net/wireless/ath/carl9170/main.c
|
||||
@@ -51,7 +51,7 @@ static int modparam_nohwcrypt;
|
||||
module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);
|
||||
MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");
|
||||
|
||||
-int modparam_ht;
|
||||
+int modparam_ht = 1;
|
||||
module_param_named(ht, modparam_ht, bool, S_IRUGO);
|
||||
MODULE_PARM_DESC(ht, "enable MPDU aggregation.");
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
--- a/drivers/net/wireless/ath/carl9170/main.c
|
||||
+++ b/drivers/net/wireless/ath/carl9170/main.c
|
||||
@@ -591,21 +591,36 @@ out:
|
||||
return err;
|
||||
}
|
||||
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
|
||||
+static u64 ar9170_op_prepare_multicast(struct ieee80211_hw *hw,
|
||||
+ struct netdev_hw_addr_list *mclist)
|
||||
+#else
|
||||
static u64 ar9170_op_prepare_multicast(struct ieee80211_hw *hw, int mc_count,
|
||||
struct dev_addr_list *mclist)
|
||||
+#endif
|
||||
{
|
||||
u64 mchash;
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
|
||||
+ struct netdev_hw_addr *ha;
|
||||
+#else
|
||||
int i;
|
||||
+#endif
|
||||
|
||||
/* always get broadcast frames */
|
||||
mchash = 1ULL << (0xff >> 2);
|
||||
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
|
||||
+ netdev_hw_addr_list_for_each(ha, mclist) {
|
||||
+ mchash |= 1ULL << (ha->addr[5] >> 2);
|
||||
+ }
|
||||
+#else
|
||||
for (i = 0; i < mc_count; i++) {
|
||||
if (WARN_ON(!mclist))
|
||||
break;
|
||||
mchash |= 1ULL << (mclist->dmi_addr[5] >> 2);
|
||||
mclist = mclist->next;
|
||||
}
|
||||
+#endif
|
||||
|
||||
return mchash;
|
||||
}
|
||||
--- a/drivers/net/wireless/ath/carl9170/usb.c
|
||||
+++ b/drivers/net/wireless/ath/carl9170/usb.c
|
||||
@@ -48,6 +48,11 @@
|
||||
#include "fwcmd.h"
|
||||
#include "usb.h"
|
||||
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
|
||||
+#define usb_buffer_alloc(dev, size, mem_flags, dma) usb_alloc_coherent(dev, size, mem_flags, dma)
|
||||
+#define usb_buffer_free(dev, size, addr, dma) usb_free_coherent(dev, size, addr, dma)
|
||||
+#endif
|
||||
+
|
||||
MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
|
||||
MODULE_AUTHOR("Christian Lamparter <chunkeey@googlemail.com>");
|
||||
MODULE_LICENSE("GPL");
|
||||
@ -1,11 +0,0 @@
|
||||
--- a/config.mk
|
||||
+++ b/config.mk
|
||||
@@ -502,7 +502,7 @@ CONFIG_ATH6KL_ENABLE_TARGET_DEBUG_PRINTS
|
||||
# CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK is not set
|
||||
CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y
|
||||
CONFIG_ATH6K_LEGACY=m
|
||||
-endif
|
||||
+endif #CONFIG_COMPAT_KERNEL_32
|
||||
endif
|
||||
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
--- a/config.mk
|
||||
+++ b/config.mk
|
||||
@@ -432,7 +432,7 @@ endif # end of SPI driver list
|
||||
@@ -441,7 +441,7 @@ endif #CONFIG_SPI_MASTER end of SPI driv
|
||||
|
||||
ifneq ($(CONFIG_MMC),)
|
||||
ifdef CONFIG_MMC
|
||||
|
||||
-CONFIG_B43_SDIO=y
|
||||
+# CONFIG_B43_SDIO=y
|
||||
|
||||
ifneq ($(CONFIG_CRC7),)
|
||||
ifdef CONFIG_CRC7
|
||||
CONFIG_WL1251_SDIO=m
|
||||
|
||||
@ -0,0 +1,38 @@
|
||||
--- a/drivers/net/wireless/ath/carl9170/main.c
|
||||
+++ b/drivers/net/wireless/ath/carl9170/main.c
|
||||
@@ -811,16 +811,34 @@ out:
|
||||
}
|
||||
|
||||
static u64 carl9170_op_prepare_multicast(struct ieee80211_hw *hw,
|
||||
- struct netdev_hw_addr_list *mc_list)
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
|
||||
+ struct netdev_hw_addr_list *mc_list)
|
||||
+#else
|
||||
+ int mc_count, struct dev_addr_list *ha)
|
||||
+#endif
|
||||
{
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
|
||||
struct netdev_hw_addr *ha;
|
||||
+#else
|
||||
+ int i;
|
||||
+#endif
|
||||
u64 mchash;
|
||||
|
||||
/* always get broadcast frames */
|
||||
mchash = 1ULL << (0xff >> 2);
|
||||
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
|
||||
netdev_hw_addr_list_for_each(ha, mc_list)
|
||||
mchash |= 1ULL << (ha->addr[5] >> 2);
|
||||
+#else
|
||||
+ for (i = 0; i < mc_count; i++) {
|
||||
+ if (!ha)
|
||||
+ break;
|
||||
+
|
||||
+ mchash |= 1ULL << (ha->dmi_addr[5] >> 2);
|
||||
+ ha = ha->next;
|
||||
+ }
|
||||
+#endif
|
||||
|
||||
return mchash;
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
--- a/include/linux/compat-2.6.33.h
|
||||
+++ b/include/linux/compat-2.6.33.h
|
||||
@@ -98,6 +98,12 @@ int pccard_loop_tuple(struct pcmcia_sock
|
||||
#define kfifo_out(a, b, c) __kfifo_get(*a, b, c)
|
||||
#define kfifo_len(a) __kfifo_len(*a)
|
||||
|
||||
+#define list_for_each_entry_continue_rcu(pos, head, member) \
|
||||
+ for (pos = list_entry_rcu(pos->member.next, typeof(*pos), member); \
|
||||
+ prefetch(pos->member.next), &pos->member != (head); \
|
||||
+ pos = list_entry_rcu(pos->member.next, typeof(*pos), member))
|
||||
+
|
||||
+
|
||||
#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)) */
|
||||
|
||||
#endif /* LINUX_26_33_COMPAT_H */
|
||||
@ -1,15 +0,0 @@
|
||||
--- a/scripts/gen-compat-autoconf.sh
|
||||
+++ b/scripts/gen-compat-autoconf.sh
|
||||
@@ -191,10 +191,8 @@ if [ -f $KLIB_BUILD/Makefile ]; then
|
||||
echo CONFIG_NETDEVICES_MULTIQUEUE >> $MULT_DEP_FILE
|
||||
define_config_multiple_deps CONFIG_MAC80211_QOS y $ALL_DEPS
|
||||
rm -f $MULT_DEP_FILE
|
||||
- # Kernels >= 2.6.32 can disable WEXT :D
|
||||
- if [ $SUBLEVEL -le 32 ]; then
|
||||
- define_config_dep CONFIG_CFG80211_WEXT 1 CONFIG_WIRELESS_EXT
|
||||
- fi
|
||||
+ # Up to kernel 2.6.35 we still need the following:
|
||||
+ define_config_dep CONFIG_CFG80211_WEXT 1 CONFIG_WIRELESS_EXT
|
||||
fi
|
||||
fi
|
||||
echo "#endif /* COMPAT_AUTOCONF_INCLUDED */"
|
||||
@ -1,23 +0,0 @@
|
||||
--- a/drivers/net/wireless/ath/ath9k/mac.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/mac.c
|
||||
@@ -714,6 +714,8 @@ int ath9k_hw_rxprocdesc(struct ath_hw *a
|
||||
else if ((ads.ds_rxstatus8 & AR_MichaelErr) &&
|
||||
rs->rs_keyix != ATH9K_RXKEYIX_INVALID)
|
||||
rs->rs_status |= ATH9K_RXERR_MIC;
|
||||
+ else if (ads.ds_rxstatus8 & AR_KeyMiss)
|
||||
+ rs->rs_status |= ATH9K_RXERR_DECRYPT;
|
||||
}
|
||||
|
||||
return 0;
|
||||
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
|
||||
@@ -616,7 +616,8 @@ int ath9k_hw_process_rxdesc_edma(struct
|
||||
rxs->rs_status |= ATH9K_RXERR_DECRYPT;
|
||||
} else if (rxsp->status11 & AR_MichaelErr) {
|
||||
rxs->rs_status |= ATH9K_RXERR_MIC;
|
||||
- }
|
||||
+ } else if (rxsp->status11 & AR_KeyMiss)
|
||||
+ rxs->rs_status |= ATH9K_RXERR_DECRYPT;
|
||||
}
|
||||
|
||||
return 0;
|
||||
@ -1,117 +0,0 @@
|
||||
--- a/drivers/net/wireless/ath/ath9k/virtual.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/virtual.c
|
||||
@@ -19,45 +19,36 @@
|
||||
#include "ath9k.h"
|
||||
|
||||
struct ath9k_vif_iter_data {
|
||||
- int count;
|
||||
- u8 *addr;
|
||||
+ const u8 *hw_macaddr;
|
||||
+ u8 mask[ETH_ALEN];
|
||||
};
|
||||
|
||||
static void ath9k_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
|
||||
{
|
||||
struct ath9k_vif_iter_data *iter_data = data;
|
||||
- u8 *nbuf;
|
||||
-
|
||||
- nbuf = krealloc(iter_data->addr, (iter_data->count + 1) * ETH_ALEN,
|
||||
- GFP_ATOMIC);
|
||||
- if (nbuf == NULL)
|
||||
- return;
|
||||
+ int i;
|
||||
|
||||
- memcpy(nbuf + iter_data->count * ETH_ALEN, mac, ETH_ALEN);
|
||||
- iter_data->addr = nbuf;
|
||||
- iter_data->count++;
|
||||
+ for (i = 0; i < ETH_ALEN; i++)
|
||||
+ iter_data->mask[i] &= ~(iter_data->hw_macaddr[i] ^ mac[i]);
|
||||
}
|
||||
|
||||
-void ath9k_set_bssid_mask(struct ieee80211_hw *hw)
|
||||
+void ath9k_set_bssid_mask(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
|
||||
{
|
||||
struct ath_wiphy *aphy = hw->priv;
|
||||
struct ath_softc *sc = aphy->sc;
|
||||
struct ath_common *common = ath9k_hw_common(sc->sc_ah);
|
||||
struct ath9k_vif_iter_data iter_data;
|
||||
- int i, j;
|
||||
- u8 mask[ETH_ALEN];
|
||||
+ int i;
|
||||
|
||||
/*
|
||||
- * Add primary MAC address even if it is not in active use since it
|
||||
- * will be configured to the hardware as the starting point and the
|
||||
- * BSSID mask will need to be changed if another address is active.
|
||||
+ * Use the hardware MAC address as reference, the hardware uses it
|
||||
+ * together with the BSSID mask when matching addresses.
|
||||
*/
|
||||
- iter_data.addr = kmalloc(ETH_ALEN, GFP_ATOMIC);
|
||||
- if (iter_data.addr) {
|
||||
- memcpy(iter_data.addr, common->macaddr, ETH_ALEN);
|
||||
- iter_data.count = 1;
|
||||
- } else
|
||||
- iter_data.count = 0;
|
||||
+ iter_data.hw_macaddr = common->macaddr;
|
||||
+ memset(&iter_data.mask, 0xff, ETH_ALEN);
|
||||
+
|
||||
+ if (vif)
|
||||
+ ath9k_vif_iter(&iter_data, vif->addr, vif);
|
||||
|
||||
/* Get list of all active MAC addresses */
|
||||
spin_lock_bh(&sc->wiphy_lock);
|
||||
@@ -71,31 +62,7 @@ void ath9k_set_bssid_mask(struct ieee802
|
||||
}
|
||||
spin_unlock_bh(&sc->wiphy_lock);
|
||||
|
||||
- /* Generate an address mask to cover all active addresses */
|
||||
- memset(mask, 0, ETH_ALEN);
|
||||
- for (i = 0; i < iter_data.count; i++) {
|
||||
- u8 *a1 = iter_data.addr + i * ETH_ALEN;
|
||||
- for (j = i + 1; j < iter_data.count; j++) {
|
||||
- u8 *a2 = iter_data.addr + j * ETH_ALEN;
|
||||
- mask[0] |= a1[0] ^ a2[0];
|
||||
- mask[1] |= a1[1] ^ a2[1];
|
||||
- mask[2] |= a1[2] ^ a2[2];
|
||||
- mask[3] |= a1[3] ^ a2[3];
|
||||
- mask[4] |= a1[4] ^ a2[4];
|
||||
- mask[5] |= a1[5] ^ a2[5];
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- kfree(iter_data.addr);
|
||||
-
|
||||
- /* Invert the mask and configure hardware */
|
||||
- common->bssidmask[0] = ~mask[0];
|
||||
- common->bssidmask[1] = ~mask[1];
|
||||
- common->bssidmask[2] = ~mask[2];
|
||||
- common->bssidmask[3] = ~mask[3];
|
||||
- common->bssidmask[4] = ~mask[4];
|
||||
- common->bssidmask[5] = ~mask[5];
|
||||
-
|
||||
+ memcpy(common->bssidmask, iter_data.mask, ETH_ALEN);
|
||||
ath_hw_setbssidmask(common);
|
||||
}
|
||||
|
||||
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
|
||||
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
|
||||
@@ -666,7 +666,7 @@ static inline void ath_ahb_exit(void) {}
|
||||
void ath9k_ps_wakeup(struct ath_softc *sc);
|
||||
void ath9k_ps_restore(struct ath_softc *sc);
|
||||
|
||||
-void ath9k_set_bssid_mask(struct ieee80211_hw *hw);
|
||||
+void ath9k_set_bssid_mask(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
|
||||
int ath9k_wiphy_add(struct ath_softc *sc);
|
||||
int ath9k_wiphy_del(struct ath_wiphy *aphy);
|
||||
void ath9k_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb);
|
||||
--- a/drivers/net/wireless/ath/ath9k/main.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/main.c
|
||||
@@ -1416,7 +1416,7 @@ static int ath9k_add_interface(struct ie
|
||||
sc->nvifs++;
|
||||
|
||||
if (ah->caps.hw_caps & ATH9K_HW_CAP_BSSIDMASK)
|
||||
- ath9k_set_bssid_mask(hw);
|
||||
+ ath9k_set_bssid_mask(hw, vif);
|
||||
|
||||
if (sc->nvifs > 1)
|
||||
goto out; /* skip global settings for secondary vif */
|
||||
@ -0,0 +1,70 @@
|
||||
--- a/drivers/net/wireless/b43/Makefile
|
||||
+++ b/drivers/net/wireless/b43/Makefile
|
||||
@@ -12,7 +12,7 @@ b43-y += xmit.o
|
||||
b43-y += lo.o
|
||||
b43-y += wa.o
|
||||
b43-y += dma.o
|
||||
-b43-y += pio.o
|
||||
+# b43-y += pio.o
|
||||
b43-y += rfkill.o
|
||||
b43-$(CONFIG_B43_LEDS) += leds.o
|
||||
b43-$(CONFIG_B43_PCMCIA) += pcmcia.o
|
||||
--- a/drivers/net/wireless/b43/main.c
|
||||
+++ b/drivers/net/wireless/b43/main.c
|
||||
@@ -1810,9 +1810,11 @@ static void b43_do_interrupt_thread(stru
|
||||
dma_reason[4], dma_reason[5]);
|
||||
b43err(dev->wl, "This device does not support DMA "
|
||||
"on your system. It will now be switched to PIO.\n");
|
||||
+#if 0
|
||||
/* Fall back to PIO transfers if we get fatal DMA errors! */
|
||||
dev->use_pio = 1;
|
||||
b43_controller_restart(dev, "DMA error");
|
||||
+#endif
|
||||
return;
|
||||
}
|
||||
if (merged_dma_reason & B43_DMAIRQ_NONFATALMASK) {
|
||||
--- a/drivers/net/wireless/b43/pio.h
|
||||
+++ b/drivers/net/wireless/b43/pio.h
|
||||
@@ -151,15 +151,34 @@ static inline void b43_piorx_write32(str
|
||||
}
|
||||
|
||||
|
||||
-int b43_pio_init(struct b43_wldev *dev);
|
||||
-void b43_pio_free(struct b43_wldev *dev);
|
||||
+static inline int b43_pio_init(struct b43_wldev *dev)
|
||||
+{
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static inline void b43_pio_free(struct b43_wldev *dev)
|
||||
+{
|
||||
+}
|
||||
+
|
||||
+static inline int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb)
|
||||
+{
|
||||
+ return 0;
|
||||
+}
|
||||
|
||||
-int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb);
|
||||
-void b43_pio_handle_txstatus(struct b43_wldev *dev,
|
||||
- const struct b43_txstatus *status);
|
||||
-void b43_pio_rx(struct b43_pio_rxqueue *q);
|
||||
+static inline void b43_pio_handle_txstatus(struct b43_wldev *dev,
|
||||
+ const struct b43_txstatus *status)
|
||||
+{
|
||||
+}
|
||||
+
|
||||
+static inline void b43_pio_rx(struct b43_pio_rxqueue *q)
|
||||
+{
|
||||
+}
|
||||
|
||||
-void b43_pio_tx_suspend(struct b43_wldev *dev);
|
||||
-void b43_pio_tx_resume(struct b43_wldev *dev);
|
||||
+static inline void b43_pio_tx_suspend(struct b43_wldev *dev)
|
||||
+{
|
||||
+}
|
||||
+static inline void b43_pio_tx_resume(struct b43_wldev *dev)
|
||||
+{
|
||||
+}
|
||||
|
||||
#endif /* B43_PIO_H_ */
|
||||
Loading…
Reference in New Issue