From e4489675b560ba14e74ed760f0ee9b96923ecad8 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 22 Nov 2009 07:13:30 +0000
Subject: [PATCH] mac80211: update to compat-wireless 2009-11-21
SVN-Revision: 18465
---
package/mac80211/Makefile | 6 +-
.../mac80211/patches/002-disable_rfkill.patch | 38 +-
package/mac80211/patches/010-b43_config.patch | 10 +-
.../011-move_ar9170_usb_compat_code.patch | 2 +-
.../mac80211/patches/012-remove_rfkill.patch | 2 +-
...h9k-fix-invalid-mac-address-handling.patch | 2 +-
.../patches/404-ath_regd_optional.patch | 2 +-
...ROM-only-if-no-platform-data-present.patch | 2 +-
.../patches/500-4addr_bcast_fix.patch | 11 -
...patch => 500-ath9k_rate_control_api.patch} | 22 +-
...patch => 501-ath9k_rc_table_cleanup.patch} | 0
...fp_dma.patch => 510-ath_use_gfp_dma.patch} | 0
.../patches/510-nl80211_vlan_add_fix.patch | 20 -
.../mac80211/patches/520-driver_flags.patch | 26 -
.../mac80211/patches/530-ath9k_cleanup.patch | 460 ------------------
.../patches/540-monitor_tx_status.patch | 14 -
.../mac80211/patches/550-ath9k_rx_fix.patch | 10 -
17 files changed, 23 insertions(+), 604 deletions(-)
delete mode 100644 package/mac80211/patches/500-4addr_bcast_fix.patch
rename package/mac80211/patches/{560-ath9k_rate_control_api.patch => 500-ath9k_rate_control_api.patch} (98%)
rename package/mac80211/patches/{561-ath9k_rc_table_cleanup.patch => 501-ath9k_rc_table_cleanup.patch} (100%)
rename package/mac80211/patches/{570-ath_use_gfp_dma.patch => 510-ath_use_gfp_dma.patch} (100%)
delete mode 100644 package/mac80211/patches/510-nl80211_vlan_add_fix.patch
delete mode 100644 package/mac80211/patches/520-driver_flags.patch
delete mode 100644 package/mac80211/patches/530-ath9k_cleanup.patch
delete mode 100644 package/mac80211/patches/540-monitor_tx_status.patch
delete mode 100644 package/mac80211/patches/550-ath9k_rx_fix.patch
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index d28e08d3ad..aef79373d7 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -10,12 +10,12 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=mac80211
-PKG_VERSION:=2009-11-13
-PKG_RELEASE:=2
+PKG_VERSION:=2009-11-21
+PKG_RELEASE:=1
PKG_SOURCE_URL:= \
http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/11 \
http://wireless.kernel.org/download/compat-wireless-2.6
-PKG_MD5SUM:=920c3bcfd1b4cd6079a8f9db4afe4e4f
+PKG_MD5SUM:=00e80559cddaa160605098572f5c58b8
PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
diff --git a/package/mac80211/patches/002-disable_rfkill.patch b/package/mac80211/patches/002-disable_rfkill.patch
index 3aab629702..c935fddf35 100644
--- a/package/mac80211/patches/002-disable_rfkill.patch
+++ b/package/mac80211/patches/002-disable_rfkill.patch
@@ -1,42 +1,6 @@
--- a/config.mk
+++ b/config.mk
-@@ -147,7 +147,7 @@ ifneq ($(CONFIG_PCI),)
-
- CONFIG_ATH5K=m
- # CONFIG_ATH5K_DEBUG=y
--CONFIG_ATH5K_RFKILL=y
-+# CONFIG_ATH5K_RFKILL=y
- CONFIG_ATH9K_HW=m
- CONFIG_ATH9K=m
- # Note: once ath9k_htc is added we'll have to move
-@@ -159,7 +159,7 @@ CONFIG_ATH9K_COMMON=m
-
- CONFIG_IWLWIFI=m
- CONFIG_IWLWIFI_LEDS=y
--CONFIG_IWLWIFI_RFKILL=y
-+# CONFIG_IWLWIFI_RFKILL=y
- CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
- # CONFIG_IWLWIFI_DEBUG=y
- # CONFIG_IWLWIFI_DEBUGFS=y
-@@ -179,7 +179,7 @@ CONFIG_B43_PCMCIA=y
- endif
- CONFIG_B43_PIO=y
- CONFIG_B43_LEDS=y
--CONFIG_B43_RFKILL=y
-+# CONFIG_B43_RFKILL=y
- CONFIG_B43_PHY_LP=y
- # CONFIG_B43_DEBUG=y
- # CONFIG_B43_FORCE_PIO=y
-@@ -189,7 +189,7 @@ CONFIG_B43LEGACY_HWRNG=y
- CONFIG_B43LEGACY_PCI_AUTOSELECT=y
- CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
- CONFIG_B43LEGACY_LEDS=y
--CONFIG_B43LEGACY_RFKILL=y
-+# CONFIG_B43LEGACY_RFKILL=y
- # CONFIG_B43LEGACY_DEBUG=y
- CONFIG_B43LEGACY_DMA=y
- CONFIG_B43LEGACY_PIO=y
-@@ -422,8 +422,8 @@ endif
+@@ -421,8 +421,8 @@ endif
# We need the backported rfkill module on kernel < 2.6.31.
# In more recent kernel versions use the in kernel rfkill module.
ifdef CONFIG_COMPAT_WIRELESS_31
diff --git a/package/mac80211/patches/010-b43_config.patch b/package/mac80211/patches/010-b43_config.patch
index 9074ee7874..8c5253550a 100644
--- a/package/mac80211/patches/010-b43_config.patch
+++ b/package/mac80211/patches/010-b43_config.patch
@@ -1,6 +1,6 @@
--- a/config.mk
+++ b/config.mk
-@@ -160,12 +160,12 @@ CONFIG_B43_HWRNG=y
+@@ -160,9 +160,9 @@ CONFIG_B43_HWRNG=y
CONFIG_B43_PCI_AUTOSELECT=y
CONFIG_B43_PCICORE_AUTOSELECT=y
ifneq ($(CONFIG_PCMCIA),)
@@ -10,13 +10,9 @@
-CONFIG_B43_PIO=y
+# CONFIG_B43_PIO=y
CONFIG_B43_LEDS=y
- # CONFIG_B43_RFKILL=y
--CONFIG_B43_PHY_LP=y
-+# CONFIG_B43_PHY_LP=y
+ CONFIG_B43_PHY_LP=y
# CONFIG_B43_DEBUG=y
- # CONFIG_B43_FORCE_PIO=y
-
-@@ -219,8 +219,8 @@ CONFIG_SSB_PCIHOST_POSSIBLE=y
+@@ -217,8 +217,8 @@ CONFIG_SSB_PCIHOST_POSSIBLE=y
CONFIG_SSB_PCIHOST=y
CONFIG_SSB_B43_PCI_BRIDGE=y
ifneq ($(CONFIG_PCMCIA),)
diff --git a/package/mac80211/patches/011-move_ar9170_usb_compat_code.patch b/package/mac80211/patches/011-move_ar9170_usb_compat_code.patch
index 036d56301f..52b90b004d 100644
--- a/package/mac80211/patches/011-move_ar9170_usb_compat_code.patch
+++ b/package/mac80211/patches/011-move_ar9170_usb_compat_code.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ar9170/usb.c
+++ b/drivers/net/wireless/ath/ar9170/usb.c
-@@ -98,6 +98,225 @@ static struct usb_device_id ar9170_usb_i
+@@ -100,6 +100,225 @@ static struct usb_device_id ar9170_usb_i
};
MODULE_DEVICE_TABLE(usb, ar9170_usb_ids);
diff --git a/package/mac80211/patches/012-remove_rfkill.patch b/package/mac80211/patches/012-remove_rfkill.patch
index 53262edd0b..a47168a05c 100644
--- a/package/mac80211/patches/012-remove_rfkill.patch
+++ b/package/mac80211/patches/012-remove_rfkill.patch
@@ -22,7 +22,7 @@
#include <linux/rfkill_backport.h>
--- a/include/linux/rfkill_backport.h
+++ b/include/linux/rfkill_backport.h
-@@ -146,7 +146,7 @@ struct rfkill_ops {
+@@ -149,7 +149,7 @@ struct rfkill_ops {
int (*set_block)(void *data, bool blocked);
};
diff --git a/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch b/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
index 1780fc7b31..687d9e4775 100644
--- a/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
+++ b/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
@@ -8,7 +8,7 @@
#include <asm/unaligned.h>
#include "hw.h"
-@@ -494,8 +495,18 @@ static int ath9k_hw_init_macaddr(struct
+@@ -489,8 +490,18 @@ static int ath9k_hw_init_macaddr(struct
common->macaddr[2 * i] = eeval >> 8;
common->macaddr[2 * i + 1] = eeval & 0xff;
}
diff --git a/package/mac80211/patches/404-ath_regd_optional.patch b/package/mac80211/patches/404-ath_regd_optional.patch
index 58ed4bdbeb..a5413697ba 100644
--- a/package/mac80211/patches/404-ath_regd_optional.patch
+++ b/package/mac80211/patches/404-ath_regd_optional.patch
@@ -10,7 +10,7 @@
#include "regd_common.h"
/*
-@@ -588,3 +591,5 @@ u32 ath_regd_get_band_ctl(struct ath_reg
+@@ -587,3 +590,5 @@ u32 ath_regd_get_band_ctl(struct ath_reg
}
}
EXPORT_SYMBOL(ath_regd_get_band_ctl);
diff --git a/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch b/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch
index 8beb224c91..734dea0306 100644
--- a/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch
+++ b/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -433,11 +433,8 @@ static void ath9k_hw_init_defaults(struc
+@@ -431,11 +431,8 @@ static void ath9k_hw_init_defaults(struc
ah->hw_version.magic = AR5416_MAGIC;
ah->hw_version.subvendorid = 0;
diff --git a/package/mac80211/patches/500-4addr_bcast_fix.patch b/package/mac80211/patches/500-4addr_bcast_fix.patch
deleted file mode 100644
index 3143aaf8f9..0000000000
--- a/package/mac80211/patches/500-4addr_bcast_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/net/mac80211/rx.c
-+++ b/net/mac80211/rx.c
-@@ -1236,7 +1236,7 @@ ieee80211_deliver_skb(struct ieee80211_r
- if ((sdata->vif.type == NL80211_IFTYPE_AP ||
- sdata->vif.type == NL80211_IFTYPE_AP_VLAN) &&
- !(sdata->flags & IEEE80211_SDATA_DONT_BRIDGE_PACKETS) &&
-- (rx->flags & IEEE80211_RX_RA_MATCH)) {
-+ (rx->flags & IEEE80211_RX_RA_MATCH) && !rx->sdata->use_4addr) {
- if (is_multicast_ether_addr(ehdr->h_dest)) {
- /*
- * send multicast frames both to higher layers in
diff --git a/package/mac80211/patches/560-ath9k_rate_control_api.patch b/package/mac80211/patches/500-ath9k_rate_control_api.patch
similarity index 98%
rename from package/mac80211/patches/560-ath9k_rate_control_api.patch
rename to package/mac80211/patches/500-ath9k_rate_control_api.patch
index b4f2a12ef1..fe476cb251 100644
--- a/package/mac80211/patches/560-ath9k_rate_control_api.patch
+++ b/package/mac80211/patches/500-ath9k_rate_control_api.patch
@@ -750,7 +750,7 @@
minlen = (nsymbols * nsymbits) / BITS_PER_BYTE;
if (frmlen < minlen) {
-@@ -1430,22 +1458,14 @@ static int setup_tx_flags(struct ath_sof
+@@ -1425,22 +1453,14 @@ static int setup_tx_flags(struct ath_sof
static u32 ath_pkt_duration(struct ath_softc *sc, u8 rix, struct ath_buf *bf,
int width, int half_gi, bool shortPreamble)
{
@@ -774,7 +774,7 @@
nsymbols = (nbits + nsymbits - 1) / nsymbits;
if (!half_gi)
-@@ -1454,7 +1474,7 @@ static u32 ath_pkt_duration(struct ath_s
+@@ -1449,7 +1469,7 @@ static u32 ath_pkt_duration(struct ath_s
duration = SYMBOL_TIME_HALFGI(nsymbols);
/* addup duration for legacy/ht training and signal fields */
@@ -783,7 +783,7 @@
duration += L_STF + L_LTF + L_SIG + HT_SIG + HT_STF + HT_LTF(streams);
return duration;
-@@ -1463,11 +1483,11 @@ static u32 ath_pkt_duration(struct ath_s
+@@ -1458,11 +1478,11 @@ static u32 ath_pkt_duration(struct ath_s
static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)
{
struct ath_common *common = ath9k_hw_common(sc->sc_ah);
@@ -796,7 +796,7 @@
struct ieee80211_hdr *hdr;
int i, flags = 0;
u8 rix = 0, ctsrate = 0;
-@@ -1486,11 +1506,10 @@ static void ath_buf_set_rate(struct ath_
+@@ -1481,11 +1501,10 @@ static void ath_buf_set_rate(struct ath_
* checking the BSS's global flag.
* But for the rate series, IEEE80211_TX_RC_USE_SHORT_PREAMBLE is used.
*/
@@ -811,7 +811,7 @@
/*
* ATH9K_TXDESC_RTSENA and ATH9K_TXDESC_CTSENA are mutually exclusive.
-@@ -1513,6 +1532,9 @@ static void ath_buf_set_rate(struct ath_
+@@ -1508,6 +1527,9 @@ static void ath_buf_set_rate(struct ath_
flags &= ~(ATH9K_TXDESC_RTSENA);
for (i = 0; i < 4; i++) {
@@ -821,7 +821,7 @@
if (!rates[i].count || (rates[i].idx < 0))
continue;
-@@ -1520,12 +1542,6 @@ static void ath_buf_set_rate(struct ath_
+@@ -1515,12 +1537,6 @@ static void ath_buf_set_rate(struct ath_
series[i].Tries = rates[i].count;
series[i].ChSel = common->tx_chainmask;
@@ -834,7 +834,7 @@
if (rates[i].flags & IEEE80211_TX_RC_USE_RTS_CTS)
series[i].RateFlags |= ATH9K_RATESERIES_RTS_CTS;
if (rates[i].flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
-@@ -1533,10 +1549,36 @@ static void ath_buf_set_rate(struct ath_
+@@ -1528,10 +1544,36 @@ static void ath_buf_set_rate(struct ath_
if (rates[i].flags & IEEE80211_TX_RC_SHORT_GI)
series[i].RateFlags |= ATH9K_RATESERIES_HALFGI;
@@ -875,7 +875,7 @@
}
/* set dur_update_en for l-sig computation except for PS-Poll frames */
-@@ -1925,8 +1967,10 @@ static void ath_tx_rc_status(struct ath_
+@@ -1920,8 +1962,10 @@ static void ath_tx_rc_status(struct ath_
}
}
@@ -897,7 +897,7 @@
#include "debug.h"
#include "common.h"
-@@ -433,6 +432,7 @@ struct ath_led {
+@@ -423,6 +422,7 @@ struct ath_led {
#define SC_OP_BT_PRIORITY_DETECTED BIT(21)
struct ath_wiphy;
@@ -905,7 +905,7 @@
struct ath_softc {
struct ieee80211_hw *hw;
-@@ -477,9 +477,8 @@ struct ath_softc {
+@@ -467,9 +467,8 @@ struct ath_softc {
struct ath_rx rx;
struct ath_tx tx;
struct ath_beacon beacon;
@@ -1223,7 +1223,7 @@
}
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -670,7 +670,7 @@ bool ath9k_hw_wait(struct ath_hw *ah, u3
+@@ -647,7 +647,7 @@ bool ath9k_hw_wait(struct ath_hw *ah, u3
u32 ath9k_hw_reverse_bits(u32 val, u32 n);
bool ath9k_get_channel_edges(struct ath_hw *ah, u16 flags, u16 *low, u16 *high);
u16 ath9k_hw_computetxtime(struct ath_hw *ah,
diff --git a/package/mac80211/patches/561-ath9k_rc_table_cleanup.patch b/package/mac80211/patches/501-ath9k_rc_table_cleanup.patch
similarity index 100%
rename from package/mac80211/patches/561-ath9k_rc_table_cleanup.patch
rename to package/mac80211/patches/501-ath9k_rc_table_cleanup.patch
diff --git a/package/mac80211/patches/570-ath_use_gfp_dma.patch b/package/mac80211/patches/510-ath_use_gfp_dma.patch
similarity index 100%
rename from package/mac80211/patches/570-ath_use_gfp_dma.patch
rename to package/mac80211/patches/510-ath_use_gfp_dma.patch
diff --git a/package/mac80211/patches/510-nl80211_vlan_add_fix.patch b/package/mac80211/patches/510-nl80211_vlan_add_fix.patch
deleted file mode 100644
index e0cdaead15..0000000000
--- a/package/mac80211/patches/510-nl80211_vlan_add_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/net/wireless/nl80211.c
-+++ b/net/wireless/nl80211.c
-@@ -1813,7 +1813,7 @@ static int nl80211_get_station(struct sk
- }
-
- /*
-- * Get vlan interface making sure it is on the right wiphy.
-+ * Get vlan interface making sure it is running and on the right wiphy.
- */
- static int get_vlan(struct genl_info *info,
- struct cfg80211_registered_device *rdev,
-@@ -1831,6 +1831,8 @@ static int get_vlan(struct genl_info *in
- return -EINVAL;
- if ((*vlan)->ieee80211_ptr->wiphy != &rdev->wiphy)
- return -EINVAL;
-+ if (!netif_running(*vlan))
-+ return -ENETDOWN;
- }
- return 0;
- }
diff --git a/package/mac80211/patches/520-driver_flags.patch b/package/mac80211/patches/520-driver_flags.patch
deleted file mode 100644
index 13d85ee1e2..0000000000
--- a/package/mac80211/patches/520-driver_flags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/include/net/mac80211.h
-+++ b/include/net/mac80211.h
-@@ -390,10 +390,12 @@ struct ieee80211_tx_rate {
- * @control: union for control data
- * @status: union for status data
- * @driver_data: array of driver_data pointers
-- * @ampdu_ack_len: number of aggregated frames.
-+ * @ampdu_ack_len: number of acked aggregated frames.
- * relevant only if IEEE80211_TX_STATUS_AMPDU was set.
- * @ampdu_ack_map: block ack bit map for the aggregation.
- * relevant only if IEEE80211_TX_STATUS_AMPDU was set.
-+ * @ampdu_len: number of aggregated frames.
-+ * relevant only if IEEE80211_TX_STATUS_AMPDU was set.
- * @ack_signal: signal strength of the ACK frame
- */
- struct ieee80211_tx_info {
-@@ -428,7 +430,8 @@ struct ieee80211_tx_info {
- u8 ampdu_ack_len;
- u64 ampdu_ack_map;
- int ack_signal;
-- /* 8 bytes free */
-+ u8 ampdu_len;
-+ /* 7 bytes free */
- } status;
- struct {
- struct ieee80211_tx_rate driver_rates[
diff --git a/package/mac80211/patches/530-ath9k_cleanup.patch b/package/mac80211/patches/530-ath9k_cleanup.patch
deleted file mode 100644
index ab205d573a..0000000000
--- a/package/mac80211/patches/530-ath9k_cleanup.patch
+++ /dev/null
@@ -1,460 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/common.h
-+++ b/drivers/net/wireless/ath/ath9k/common.h
-@@ -81,6 +81,7 @@ struct ath_buf {
- u16 bf_flags;
- struct ath_buf_state bf_state;
- dma_addr_t bf_dmacontext;
-+ struct ath_wiphy *aphy;
- };
-
- struct ath_atx_tid {
---- a/drivers/net/wireless/ath/ath9k/rc.h
-+++ b/drivers/net/wireless/ath/ath9k/rc.h
-@@ -167,24 +167,18 @@ struct ath_rate_priv {
- struct ath_rate_softc *asc;
- };
-
-+#define ATH_TX_INFO_FRAME_TYPE_INTERNAL (1 << 0)
-+#define ATH_TX_INFO_FRAME_TYPE_PAUSE (1 << 1)
-+#define ATH_TX_INFO_UPDATE_RC (1 << 2)
-+#define ATH_TX_INFO_XRETRY (1 << 3)
-+#define ATH_TX_INFO_UNDERRUN (1 << 4)
-+
- enum ath9k_internal_frame_type {
- ATH9K_NOT_INTERNAL,
- ATH9K_INT_PAUSE,
- ATH9K_INT_UNPAUSE
- };
-
--struct ath_tx_info_priv {
-- struct ath_wiphy *aphy;
-- struct ath_tx_status tx;
-- int n_frames;
-- int n_bad_frames;
-- bool update_rc;
-- enum ath9k_internal_frame_type frame_type;
--};
--
--#define ATH_TX_INFO_PRIV(tx_info) \
-- ((struct ath_tx_info_priv *)((tx_info)->rate_driver_data[0]))
--
- void ath_rate_attach(struct ath_softc *sc);
- u8 ath_rate_findrateix(struct ath_softc *sc, u8 dot11_rate);
- int ath_rate_control_register(void);
---- a/drivers/net/wireless/ath/ath9k/virtual.c
-+++ b/drivers/net/wireless/ath/ath9k/virtual.c
-@@ -338,13 +338,11 @@ void ath9k_wiphy_chan_work(struct work_s
- void ath9k_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
- {
- struct ath_wiphy *aphy = hw->priv;
-- struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
- struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
-- struct ath_tx_info_priv *tx_info_priv = ATH_TX_INFO_PRIV(tx_info);
-
-- if (tx_info_priv && tx_info_priv->frame_type == ATH9K_INT_PAUSE &&
-+ if ((tx_info->pad[0] & ATH_TX_INFO_FRAME_TYPE_PAUSE) &&
- aphy->state == ATH_WIPHY_PAUSING) {
-- if (!(info->flags & IEEE80211_TX_STAT_ACK)) {
-+ if (!(tx_info->flags & IEEE80211_TX_STAT_ACK)) {
- printk(KERN_DEBUG "ath9k: %s: no ACK for pause "
- "frame\n", wiphy_name(hw->wiphy));
- /*
-@@ -363,9 +361,6 @@ void ath9k_tx_status(struct ieee80211_hw
- }
- }
-
-- kfree(tx_info_priv);
-- tx_info->rate_driver_data[0] = NULL;
--
- dev_kfree_skb(skb);
- }
-
---- a/drivers/net/wireless/ath/ath9k/xmit.c
-+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -251,6 +251,7 @@ static struct ath_buf* ath_clone_txbuf(s
-
- ATH_TXBUF_RESET(tbf);
-
-+ tbf->aphy = bf->aphy;
- tbf->bf_mpdu = bf->bf_mpdu;
- tbf->bf_buf_addr = bf->bf_buf_addr;
- *(tbf->bf_desc) = *(bf->bf_desc);
-@@ -270,7 +271,6 @@ static void ath_tx_complete_aggr(struct
- struct ieee80211_hw *hw;
- struct ieee80211_hdr *hdr;
- struct ieee80211_tx_info *tx_info;
-- struct ath_tx_info_priv *tx_info_priv;
- struct ath_atx_tid *tid = NULL;
- struct ath_buf *bf_next, *bf_last = bf->bf_lastbf;
- struct ath_desc *ds = bf_last->bf_desc;
-@@ -284,8 +284,7 @@ static void ath_tx_complete_aggr(struct
- hdr = (struct ieee80211_hdr *)skb->data;
-
- tx_info = IEEE80211_SKB_CB(skb);
-- tx_info_priv = (struct ath_tx_info_priv *) tx_info->rate_driver_data[0];
-- hw = tx_info_priv->aphy->hw;
-+ hw = bf->aphy->hw;
-
- rcu_read_lock();
-
-@@ -464,7 +463,6 @@ static u32 ath_lookup_rate(struct ath_so
- struct sk_buff *skb;
- struct ieee80211_tx_info *tx_info;
- struct ieee80211_tx_rate *rates;
-- struct ath_tx_info_priv *tx_info_priv;
- u32 max_4ms_framelen, frmlen;
- u16 aggr_limit, legacy = 0;
- int i;
-@@ -472,7 +470,6 @@ static u32 ath_lookup_rate(struct ath_so
- skb = bf->bf_mpdu;
- tx_info = IEEE80211_SKB_CB(skb);
- rates = tx_info->control.rates;
-- tx_info_priv = (struct ath_tx_info_priv *)tx_info->rate_driver_data[0];
-
- /*
- * Find the lowest frame length among the rate series that will have a
-@@ -1560,21 +1557,26 @@ static int ath_tx_setup_buffer(struct ie
- struct ath_softc *sc = aphy->sc;
- struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-- struct ath_tx_info_priv *tx_info_priv;
- int hdrlen;
- __le16 fc;
-
-- tx_info_priv = kzalloc(sizeof(*tx_info_priv), GFP_ATOMIC);
-- if (unlikely(!tx_info_priv))
-- return -ENOMEM;
-- tx_info->rate_driver_data[0] = tx_info_priv;
-- tx_info_priv->aphy = aphy;
-- tx_info_priv->frame_type = txctl->frame_type;
-+ tx_info->pad[0] = 0;
-+ switch (txctl->frame_type) {
-+ case ATH9K_NOT_INTERNAL:
-+ break;
-+ case ATH9K_INT_PAUSE:
-+ tx_info->pad[0] |= ATH_TX_INFO_FRAME_TYPE_PAUSE;
-+ /* fall through */
-+ case ATH9K_INT_UNPAUSE:
-+ tx_info->pad[0] |= ATH_TX_INFO_FRAME_TYPE_INTERNAL;
-+ break;
-+ }
- hdrlen = ieee80211_get_hdrlen_from_skb(skb);
- fc = hdr->frame_control;
-
- ATH_TXBUF_RESET(bf);
-
-+ bf->aphy = aphy;
- bf->bf_frmlen = skb->len + FCS_LEN - (hdrlen & 3);
-
- if (conf_is_ht(&hw->conf) && !is_pae(skb))
-@@ -1599,8 +1601,6 @@ static int ath_tx_setup_buffer(struct ie
- skb->len, DMA_TO_DEVICE);
- if (unlikely(dma_mapping_error(sc->dev, bf->bf_dmacontext))) {
- bf->bf_mpdu = NULL;
-- kfree(tx_info_priv);
-- tx_info->rate_driver_data[0] = NULL;
- ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_FATAL,
- "dma_mapping_error() on TX\n");
- return -ENOMEM;
-@@ -1781,27 +1781,17 @@ exit:
- /*****************/
-
- static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
-- int tx_flags)
-+ struct ath_wiphy *aphy, int tx_flags)
- {
- struct ieee80211_hw *hw = sc->hw;
- struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
-- struct ath_tx_info_priv *tx_info_priv = ATH_TX_INFO_PRIV(tx_info);
- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
- int hdrlen, padsize;
-- int frame_type = ATH9K_NOT_INTERNAL;
-
- ath_print(common, ATH_DBG_XMIT, "TX complete: skb: %p\n", skb);
-
-- if (tx_info_priv) {
-- hw = tx_info_priv->aphy->hw;
-- frame_type = tx_info_priv->frame_type;
-- }
--
-- if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK ||
-- tx_info->flags & IEEE80211_TX_STAT_TX_FILTERED) {
-- kfree(tx_info_priv);
-- tx_info->rate_driver_data[0] = NULL;
-- }
-+ if (aphy)
-+ hw = aphy->hw;
-
- if (tx_flags & ATH_TX_BAR)
- tx_info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK;
-@@ -1833,10 +1823,10 @@ static void ath_tx_complete(struct ath_s
- SC_OP_WAIT_FOR_TX_ACK));
- }
-
-- if (frame_type == ATH9K_NOT_INTERNAL)
-- ieee80211_tx_status(hw, skb);
-- else
-+ if (unlikely(tx_info->pad[0] & ATH_TX_INFO_FRAME_TYPE_INTERNAL))
- ath9k_tx_status(hw, skb);
-+ else
-+ ieee80211_tx_status(hw, skb);
- }
-
- static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf,
-@@ -1859,7 +1849,7 @@ static void ath_tx_complete_buf(struct a
- }
-
- dma_unmap_single(sc->dev, bf->bf_dmacontext, skb->len, DMA_TO_DEVICE);
-- ath_tx_complete(sc, skb, tx_flags);
-+ ath_tx_complete(sc, skb, bf->aphy, tx_flags);
- ath_debug_stat_tx(sc, txq, bf);
-
- /*
-@@ -1907,8 +1897,7 @@ static void ath_tx_rc_status(struct ath_
- struct sk_buff *skb = bf->bf_mpdu;
- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
- struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
-- struct ath_tx_info_priv *tx_info_priv = ATH_TX_INFO_PRIV(tx_info);
-- struct ieee80211_hw *hw = tx_info_priv->aphy->hw;
-+ struct ieee80211_hw *hw = bf->aphy->hw;
- u8 i, tx_rateindex;
-
- if (txok)
-@@ -1917,17 +1906,22 @@ static void ath_tx_rc_status(struct ath_
- tx_rateindex = ds->ds_txstat.ts_rateindex;
- WARN_ON(tx_rateindex >= hw->max_rates);
-
-- tx_info_priv->update_rc = update_rc;
-+ if (update_rc)
-+ tx_info->pad[0] |= ATH_TX_INFO_UPDATE_RC;
- if (ds->ds_txstat.ts_status & ATH9K_TXERR_FILT)
- tx_info->flags |= IEEE80211_TX_STAT_TX_FILTERED;
-
- if ((ds->ds_txstat.ts_status & ATH9K_TXERR_FILT) == 0 &&
- (bf->bf_flags & ATH9K_TXDESC_NOACK) == 0 && update_rc) {
- if (ieee80211_is_data(hdr->frame_control)) {
-- memcpy(&tx_info_priv->tx, &ds->ds_txstat,
-- sizeof(tx_info_priv->tx));
-- tx_info_priv->n_frames = bf->bf_nframes;
-- tx_info_priv->n_bad_frames = nbad;
-+ if (ds->ds_txstat.ts_flags &
-+ (ATH9K_TX_DATA_UNDERRUN | ATH9K_TX_DELIM_UNDERRUN))
-+ tx_info->pad[0] |= ATH_TX_INFO_UNDERRUN;
-+ if ((ds->ds_txstat.ts_status & ATH9K_TXERR_XRETRY) ||
-+ (ds->ds_txstat.ts_status & ATH9K_TXERR_FIFO))
-+ tx_info->pad[0] |= ATH_TX_INFO_XRETRY;
-+ tx_info->status.ampdu_len = bf->bf_nframes;
-+ tx_info->status.ampdu_ack_len = bf->bf_nframes - nbad;
- }
- }
-
---- a/drivers/net/wireless/ath/ath9k/debug.c
-+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -257,14 +257,17 @@ static const struct file_operations fops
-
- void ath_debug_stat_rc(struct ath_softc *sc, struct sk_buff *skb)
- {
-- struct ath_tx_info_priv *tx_info_priv = NULL;
- struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
- struct ieee80211_tx_rate *rates = tx_info->status.rates;
-- int final_ts_idx, idx;
-+ int final_ts_idx = 0, idx, i;
- struct ath_rc_stats *stats;
-
-- tx_info_priv = ATH_TX_INFO_PRIV(tx_info);
-- final_ts_idx = tx_info_priv->tx.ts_rateindex;
-+ for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
-+ if (!rates[i].count)
-+ break;
-+
-+ final_ts_idx = i;
-+ }
- idx = rates[final_ts_idx].idx;
- stats = &sc->debug.stats.rcstats[idx];
- stats->success++;
---- a/drivers/net/wireless/ath/ath9k/rc.c
-+++ b/drivers/net/wireless/ath/ath9k/rc.c
-@@ -859,12 +859,12 @@ static void ath_get_rate(void *priv, str
- static bool ath_rc_update_per(struct ath_softc *sc,
- const struct ath_rate_table *rate_table,
- struct ath_rate_priv *ath_rc_priv,
-- struct ath_tx_info_priv *tx_info_priv,
-+ struct ieee80211_tx_info *tx_info,
- int tx_rate, int xretries, int retries,
- u32 now_msec)
- {
- bool state_change = false;
-- int count;
-+ int count, n_bad_frames;
- u8 last_per;
- static u32 nretry_to_per_lookup[10] = {
- 100 * 0 / 1,
-@@ -880,6 +880,7 @@ static bool ath_rc_update_per(struct ath
- };
-
- last_per = ath_rc_priv->per[tx_rate];
-+ n_bad_frames = tx_info->status.ampdu_len - tx_info->status.ampdu_ack_len;
-
- if (xretries) {
- if (xretries == 1) {
-@@ -907,7 +908,7 @@ static bool ath_rc_update_per(struct ath
- if (retries >= count)
- retries = count - 1;
-
-- if (tx_info_priv->n_bad_frames) {
-+ if (n_bad_frames) {
- /* new_PER = 7/8*old_PER + 1/8*(currentPER)
- * Assuming that n_frames is not 0. The current PER
- * from the retries is 100 * retries / (retries+1),
-@@ -920,14 +921,14 @@ static bool ath_rc_update_per(struct ath
- * the above PER. The expression below is a
- * simplified version of the sum of these two terms.
- */
-- if (tx_info_priv->n_frames > 0) {
-- int n_frames, n_bad_frames;
-+ if (tx_info->status.ampdu_len > 0) {
-+ int n_frames, n_bad_tries;
- u8 cur_per, new_per;
-
-- n_bad_frames = retries * tx_info_priv->n_frames +
-- tx_info_priv->n_bad_frames;
-- n_frames = tx_info_priv->n_frames * (retries + 1);
-- cur_per = (100 * n_bad_frames / n_frames) >> 3;
-+ n_bad_tries = retries * tx_info->status.ampdu_len +
-+ n_bad_frames;
-+ n_frames = tx_info->status.ampdu_len * (retries + 1);
-+ cur_per = (100 * n_bad_tries / n_frames) >> 3;
- new_per = (u8)(last_per - (last_per >> 3) + cur_per);
- ath_rc_priv->per[tx_rate] = new_per;
- }
-@@ -943,8 +944,7 @@ static bool ath_rc_update_per(struct ath
- * this was a probe. Otherwise, ignore the probe.
- */
- if (ath_rc_priv->probe_rate && ath_rc_priv->probe_rate == tx_rate) {
-- if (retries > 0 || 2 * tx_info_priv->n_bad_frames >
-- tx_info_priv->n_frames) {
-+ if (retries > 0 || 2 * n_bad_frames > tx_info->status.ampdu_len) {
- /*
- * Since we probed with just a single attempt,
- * any retries means the probe failed. Also,
-@@ -1003,7 +1003,7 @@ static bool ath_rc_update_per(struct ath
-
- static void ath_rc_update_ht(struct ath_softc *sc,
- struct ath_rate_priv *ath_rc_priv,
-- struct ath_tx_info_priv *tx_info_priv,
-+ struct ieee80211_tx_info *tx_info,
- int tx_rate, int xretries, int retries)
- {
- u32 now_msec = jiffies_to_msecs(jiffies);
-@@ -1020,7 +1020,7 @@ static void ath_rc_update_ht(struct ath_
-
- /* Update PER first */
- state_change = ath_rc_update_per(sc, rate_table, ath_rc_priv,
-- tx_info_priv, tx_rate, xretries,
-+ tx_info, tx_rate, xretries,
- retries, now_msec);
-
- /*
-@@ -1098,7 +1098,6 @@ static void ath_rc_tx_status(struct ath_
- struct ieee80211_tx_info *tx_info,
- int final_ts_idx, int xretries, int long_retry)
- {
-- struct ath_tx_info_priv *tx_info_priv = ATH_TX_INFO_PRIV(tx_info);
- const struct ath_rate_table *rate_table;
- struct ieee80211_tx_rate *rates = tx_info->status.rates;
- u8 flags;
-@@ -1124,9 +1123,8 @@ static void ath_rc_tx_status(struct ath_
- return;
-
- rix = ath_rc_get_rateindex(rate_table, &rates[i]);
-- ath_rc_update_ht(sc, ath_rc_priv,
-- tx_info_priv, rix,
-- xretries ? 1 : 2,
-+ ath_rc_update_ht(sc, ath_rc_priv, tx_info,
-+ rix, xretries ? 1 : 2,
- rates[i].count);
- }
- }
-@@ -1149,8 +1147,7 @@ static void ath_rc_tx_status(struct ath_
- return;
-
- rix = ath_rc_get_rateindex(rate_table, &rates[i]);
-- ath_rc_update_ht(sc, ath_rc_priv, tx_info_priv, rix,
-- xretries, long_retry);
-+ ath_rc_update_ht(sc, ath_rc_priv, tx_info, rix, xretries, long_retry);
- }
-
- static const
-@@ -1301,23 +1298,30 @@ static void ath_tx_status(void *priv, st
- {
- struct ath_softc *sc = priv;
- struct ath_rate_priv *ath_rc_priv = priv_sta;
-- struct ath_tx_info_priv *tx_info_priv = NULL;
- struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
- struct ieee80211_hdr *hdr;
-- int final_ts_idx, tx_status = 0, is_underrun = 0;
-+ int final_ts_idx = 0, tx_status = 0, is_underrun = 0;
-+ int long_retry = 0;
- __le16 fc;
-+ int i;
-
- hdr = (struct ieee80211_hdr *)skb->data;
- fc = hdr->frame_control;
-- tx_info_priv = ATH_TX_INFO_PRIV(tx_info);
-- final_ts_idx = tx_info_priv->tx.ts_rateindex;
-+ for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
-+ struct ieee80211_tx_rate *rate = &tx_info->status.rates[i];
-+ if (!rate->count)
-+ break;
-+
-+ final_ts_idx = i;
-+ long_retry = rate->count - 1;
-+ }
-
- if (!priv_sta || !ieee80211_is_data(fc) ||
-- !tx_info_priv->update_rc)
-- goto exit;
-+ !(tx_info->pad[0] & ATH_TX_INFO_UPDATE_RC))
-+ return;
-
-- if (tx_info_priv->tx.ts_status & ATH9K_TXERR_FILT)
-- goto exit;
-+ if (tx_info->flags & IEEE80211_TX_STAT_TX_FILTERED)
-+ return;
-
- /*
- * If underrun error is seen assume it as an excessive retry only
-@@ -1325,20 +1329,17 @@ static void ath_tx_status(void *priv, st
- * Adjust the long retry as if the frame was tried hw->max_rate_tries
- * times. This affects how ratectrl updates PER for the failed rate.
- */
-- if (tx_info_priv->tx.ts_flags &
-- (ATH9K_TX_DATA_UNDERRUN | ATH9K_TX_DELIM_UNDERRUN) &&
-- ((sc->sc_ah->tx_trig_level) >= ath_rc_priv->tx_triglevel_max)) {
-+ if ((tx_info->pad[0] & ATH_TX_INFO_UNDERRUN) &&
-+ (sc->sc_ah->tx_trig_level >= ath_rc_priv->tx_triglevel_max)) {
- tx_status = 1;
- is_underrun = 1;
- }
-
-- if ((tx_info_priv->tx.ts_status & ATH9K_TXERR_XRETRY) ||
-- (tx_info_priv->tx.ts_status & ATH9K_TXERR_FIFO))
-+ if (tx_info->pad[0] & ATH_TX_INFO_XRETRY)
- tx_status = 1;
-
- ath_rc_tx_status(sc, ath_rc_priv, tx_info, final_ts_idx, tx_status,
-- (is_underrun) ? sc->hw->max_rate_tries :
-- tx_info_priv->tx.ts_longretry);
-+ (is_underrun) ? sc->hw->max_rate_tries : long_retry);
-
- /* Check if aggregation has to be enabled for this tid */
- if (conf_is_ht(&sc->hw->conf) &&
-@@ -1357,8 +1358,6 @@ static void ath_tx_status(void *priv, st
- }
-
- ath_debug_stat_rc(sc, skb);
--exit:
-- kfree(tx_info_priv);
- }
-
- static void ath_rate_init(void *priv, struct ieee80211_supported_band *sband,
diff --git a/package/mac80211/patches/540-monitor_tx_status.patch b/package/mac80211/patches/540-monitor_tx_status.patch
deleted file mode 100644
index b2a35de852..0000000000
--- a/package/mac80211/patches/540-monitor_tx_status.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/net/mac80211/main.c
-+++ b/net/mac80211/main.c
-@@ -587,6 +587,11 @@ void ieee80211_tx_status(struct ieee8021
- if (!netif_running(sdata->dev))
- continue;
-
-+ if ((sdata->u.mntr_flags & MONITOR_FLAG_COOK_FRAMES) &&
-+ !(info->flags & IEEE80211_TX_CTL_INJECTED) &&
-+ (type == IEEE80211_FTYPE_DATA))
-+ continue;
-+
- if (prev_dev) {
- skb2 = skb_clone(skb, GFP_ATOMIC);
- if (skb2) {
diff --git a/package/mac80211/patches/550-ath9k_rx_fix.patch b/package/mac80211/patches/550-ath9k_rx_fix.patch
deleted file mode 100644
index cdef13cf33..0000000000
--- a/package/mac80211/patches/550-ath9k_rx_fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/common.c
-+++ b/drivers/net/wireless/ath/ath9k/common.c
-@@ -203,6 +203,7 @@ int ath9k_cmn_rx_skb_preprocess(struct a
- {
- struct ath_hw *ah = common->ah;
-
-+ memset(rx_status, 0, sizeof(struct ieee80211_rx_status));
- if (!ath9k_rx_accept(common, skb, rx_status, rx_stats, decrypt_error))
- return -EINVAL;
-
--
GitLab