parent
1219918537
commit
dd4893f453
@ -1,25 +0,0 @@ |
||||
--- a/config.mk
|
||||
+++ b/config.mk
|
||||
@@ -201,9 +201,9 @@ CONFIG_B43_HWRNG=y
|
||||
CONFIG_B43_PCI_AUTOSELECT=y
|
||||
CONFIG_B43_PCICORE_AUTOSELECT=y
|
||||
ifneq ($(CONFIG_PCMCIA),)
|
||||
-CONFIG_B43_PCMCIA=y
|
||||
+# CONFIG_B43_PCMCIA=y
|
||||
endif
|
||||
-CONFIG_B43_PIO=y
|
||||
+# CONFIG_B43_PIO=y
|
||||
CONFIG_B43_LEDS=y
|
||||
CONFIG_B43_PHY_LP=y
|
||||
# CONFIG_B43_DEBUG=y
|
||||
@@ -258,8 +258,8 @@ CONFIG_SSB_PCIHOST_POSSIBLE=y
|
||||
CONFIG_SSB_PCIHOST=y
|
||||
CONFIG_SSB_B43_PCI_BRIDGE=y
|
||||
ifneq ($(CONFIG_PCMCIA),)
|
||||
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
|
||||
-CONFIG_SSB_PCMCIAHOST=y
|
||||
+# CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
|
||||
+# CONFIG_SSB_PCMCIAHOST=y
|
||||
endif
|
||||
# CONFIG_SSB_DEBUG=y
|
||||
CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
|
@ -0,0 +1,11 @@ |
||||
--- a/config.mk
|
||||
+++ b/config.mk
|
||||
@@ -8,7 +8,7 @@ ifeq ($(wildcard $(KLIB_BUILD)/.config),
|
||||
# These will be ignored by compat autoconf
|
||||
CONFIG_PCI=y
|
||||
CONFIG_USB=y
|
||||
- CONFIG_PCMCIA=y
|
||||
+ # CONFIG_PCMCIA=y
|
||||
CONFIG_SSB=m
|
||||
else
|
||||
include $(KLIB_BUILD)/.config
|
@ -1,20 +0,0 @@ |
||||
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
||||
@@ -1233,6 +1233,17 @@ void ath9k_hw_init_global_settings(struc
|
||||
/* As defined by IEEE 802.11-2007 17.3.8.6 */
|
||||
slottime = ah->slottime + 3 * ah->coverage_class;
|
||||
acktimeout = slottime + sifstime;
|
||||
+
|
||||
+ /*
|
||||
+ * Workaround for early ACK timeouts, add an offset to match the
|
||||
+ * initval's 64us ack timeout value.
|
||||
+ * This was initially only meant to work around an issue with delayed
|
||||
+ * BA frames in some implementations, but it has been found to fix ACK
|
||||
+ * timeout issues in other cases as well.
|
||||
+ */
|
||||
+ if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ)
|
||||
+ acktimeout += 64 - sifstime - ah->slottime;
|
||||
+
|
||||
ath9k_hw_setslottime(ah, slottime);
|
||||
ath9k_hw_set_ack_timeout(ah, acktimeout);
|
||||
ath9k_hw_set_cts_timeout(ah, acktimeout);
|
@ -1,20 +0,0 @@ |
||||
--- a/drivers/net/wireless/ath/ath9k/xmit.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
|
||||
@@ -1610,7 +1610,7 @@ static int ath_tx_setup_buffer(struct ie
|
||||
bf->bf_frmlen -= padsize;
|
||||
}
|
||||
|
||||
- if (conf_is_ht(&hw->conf) && !is_pae(skb))
|
||||
+ if (conf_is_ht(&hw->conf))
|
||||
bf->bf_state.bf_type |= BUF_HT;
|
||||
|
||||
bf->bf_flags = setup_tx_flags(sc, skb, txctl->txq);
|
||||
@@ -1696,7 +1696,7 @@ static void ath_tx_start_dma(struct ath_
|
||||
goto tx_done;
|
||||
}
|
||||
|
||||
- if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) {
|
||||
+ if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && !is_pae(skb)) {
|
||||
/*
|
||||
* Try aggregation if it's a unicast data frame
|
||||
* and the destination is HT capable.
|
Loading…
Reference in new issue