diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-02-21 15:43:09 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-02-21 15:43:09 +0000 |
| commit | 2ae5683e83061440fd0c7db3353364ddd968bd93 (patch) | |
| tree | e88a4b0638a48884106e4ca51ca0c7ddd60cb35c /package | |
| parent | 3ab3adb14560fb1dffeec2aee7d001c4024e6bce (diff) | |
| download | upstream-2ae5683e83061440fd0c7db3353364ddd968bd93.tar.gz upstream-2ae5683e83061440fd0c7db3353364ddd968bd93.tar.bz2 upstream-2ae5683e83061440fd0c7db3353364ddd968bd93.zip | |
fix accidently commited ancient mac80211 patches in r19789-19791 (#6716)
SVN-Revision: 19797
Diffstat (limited to 'package')
| -rw-r--r-- | package/mac80211/patches/560-ath9k_fix_eap_handling.patch | 37 | ||||
| -rw-r--r-- | package/mac80211/patches/570-ap_vlan_injection.patch | 11 |
2 files changed, 0 insertions, 48 deletions
diff --git a/package/mac80211/patches/560-ath9k_fix_eap_handling.patch b/package/mac80211/patches/560-ath9k_fix_eap_handling.patch deleted file mode 100644 index d72fa97ad7..0000000000 --- a/package/mac80211/patches/560-ath9k_fix_eap_handling.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/drivers/net/wireless/ath/ath9k/xmit.c -+++ b/drivers/net/wireless/ath/ath9k/xmit.c -@@ -1353,25 +1353,6 @@ static enum ath9k_pkt_type get_hw_packet - return htype; - } - --static bool is_pae(struct sk_buff *skb) --{ -- struct ieee80211_hdr *hdr; -- __le16 fc; -- -- hdr = (struct ieee80211_hdr *)skb->data; -- fc = hdr->frame_control; -- -- if (ieee80211_is_data(fc)) { -- if (ieee80211_is_nullfunc(fc) || -- /* Port Access Entity (IEEE 802.1X) */ -- (skb->protocol == cpu_to_be16(ETH_P_PAE))) { -- return true; -- } -- } -- -- return false; --} -- - static int get_hw_crypto_keytype(struct sk_buff *skb) - { - struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); -@@ -1610,7 +1591,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); diff --git a/package/mac80211/patches/570-ap_vlan_injection.patch b/package/mac80211/patches/570-ap_vlan_injection.patch deleted file mode 100644 index 581b4a0143..0000000000 --- a/package/mac80211/patches/570-ap_vlan_injection.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/net/mac80211/tx.c -+++ b/net/mac80211/tx.c -@@ -1135,6 +1135,8 @@ ieee80211_tx_prepare(struct ieee80211_su - tx->sta = rcu_dereference(sdata->u.vlan.sta); - if (!tx->sta && sdata->dev->ieee80211_ptr->use_4addr) - return TX_DROP; -+ } else if (info->flags & IEEE80211_TX_CTL_INJECTED) { -+ tx->sta = sta_info_get_bss(sdata, hdr->addr1); - } - if (!tx->sta) - tx->sta = sta_info_get(sdata, hdr->addr1); |