From: Felix Fietkau Date: Mon, 21 Apr 2008 03:45:22 +0000 (+0000) Subject: reorder patches X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3e03e66d7a25aa8a73d40874e74d0e28d41de505;p=openwrt%2Fstaging%2Frmilecki.git reorder patches SVN-Revision: 10898 --- diff --git a/package/madwifi/patches/342-performance.patch b/package/madwifi/patches/342-performance.patch new file mode 100644 index 00000000000..0297e0cdfb2 --- /dev/null +++ b/package/madwifi/patches/342-performance.patch @@ -0,0 +1,230 @@ +Index: madwifi-trunk-r3314/ath/if_ath.c +=================================================================== +--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-04-17 18:17:28.000000000 +0200 ++++ madwifi-trunk-r3314/ath/if_ath.c 2008-04-17 18:17:28.000000000 +0200 +@@ -3237,7 +3237,6 @@ + struct ath_softc *sc = dev->priv; + struct ieee80211_node *ni = NULL; + struct ath_buf *bf = NULL; +- struct ether_header *eh; + ath_bufhead bf_head; + struct ath_buf *tbf, *tempbf; + struct sk_buff *tskb; +@@ -3249,6 +3248,7 @@ + */ + int requeue = 0; + #ifdef ATH_SUPERG_FF ++ struct ether_header *eh; + unsigned int pktlen; + struct ieee80211com *ic = &sc->sc_ic; + struct ath_node *an; +@@ -3314,27 +3314,9 @@ + requeue = 1; + goto hardstart_fail; + } +-#endif + +- /* If the skb data is shared, we will copy it so we can strip padding +- * without affecting any other bridge ports. */ +- if (skb_cloned(skb)) { +- /* Remember the original SKB so we can free up our references */ +- struct sk_buff *skb_new; +- skb_new = skb_copy(skb, GFP_ATOMIC); +- if (skb_new == NULL) { +- DPRINTF(sc, ATH_DEBUG_XMIT, +- "Dropping; skb_copy failure.\n"); +- /* No free RAM, do not requeue! */ +- goto hardstart_fail; +- } +- ieee80211_skb_copy_noderef(skb, skb_new); +- ieee80211_dev_kfree_skb(&skb); +- skb = skb_new; +- } + eh = (struct ether_header *)skb->data; + +-#ifdef ATH_SUPERG_FF + /* NB: use this lock to protect an->an_tx_ffbuf (and txq->axq_stageq) + * in athff_can_aggregate() call too. */ + ATH_TXQ_LOCK_IRQ(txq); +Index: madwifi-trunk-r3314/net80211/ieee80211_output.c +=================================================================== +--- madwifi-trunk-r3314.orig/net80211/ieee80211_output.c 2008-04-17 18:17:27.000000000 +0200 ++++ madwifi-trunk-r3314/net80211/ieee80211_output.c 2008-04-17 18:18:04.000000000 +0200 +@@ -283,7 +283,7 @@ + * normal vap. */ + if (vap->iv_xrvap && (ni == vap->iv_bss) && + vap->iv_xrvap->iv_sta_assoc) { +- struct sk_buff *skb1 = skb_copy(skb, GFP_ATOMIC); ++ struct sk_buff *skb1 = skb_clone(skb, GFP_ATOMIC); + if (skb1) { + memset(SKB_CB(skb1), 0, sizeof(struct ieee80211_cb)); + #ifdef IEEE80211_DEBUG_REFCNT +@@ -615,100 +615,45 @@ + skb = skb_unshare(skb, GFP_ATOMIC); + } + +-#ifdef ATH_SUPERG_FF +- if (isff) { +- if (skb == NULL) { ++ if (skb_cloned(skb) || ++ (need_headroom > skb_headroom(skb)) || ++ (!isff && (need_tailroom > skb_tailroom(skb)))) { ++ ++ if (pskb_expand_head(skb, need_headroom, need_tailroom, GFP_ATOMIC)) { + IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT, +- "%s: cannot unshare for encapsulation\n", +- __func__); ++ "%s: cannot expand storage (tail)\n", __func__); + vap->iv_stats.is_tx_nobuf++; +- ieee80211_dev_kfree_skb(&skb2); +- ++ ieee80211_dev_kfree_skb(&skb); + return NULL; + } ++ } + +- /* first skb header */ +- if (skb_headroom(skb) < need_headroom) { +- struct sk_buff *tmp = skb; +- skb = skb_realloc_headroom(skb, need_headroom); +- if (skb == NULL) { +- IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT, +- "%s: cannot expand storage (head1)\n", +- __func__); +- vap->iv_stats.is_tx_nobuf++; +- ieee80211_dev_kfree_skb(&skb2); +- return NULL; +- } else +- ieee80211_skb_copy_noderef(tmp, skb); +- ieee80211_dev_kfree_skb(&tmp); +- /* NB: cb[] area was copied, but not next ptr. must do that +- * prior to return on success. */ ++#ifdef ATH_SUPERG_FF ++ if (isff) { ++ if (skb_shared(skb2)) { ++ /* Take our own reference to the node in the clone */ ++ ieee80211_ref_node(SKB_CB(skb2)->ni); ++ /* Unshare the node, decrementing users in the old skb */ ++ skb2 = skb_unshare(skb2, GFP_ATOMIC); + } + +- /* second skb with header and tail adjustments possible */ +- if (skb_tailroom(skb2) < need_tailroom) { +- int n = 0; +- if (inter_headroom > skb_headroom(skb2)) +- n = inter_headroom - skb_headroom(skb2); +- if (pskb_expand_head(skb2, n, +- need_tailroom - skb_tailroom(skb2), GFP_ATOMIC)) { +- ieee80211_dev_kfree_skb(&skb2); +- IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT, +- "%s: cannot expand storage (tail2)\n", +- __func__); +- vap->iv_stats.is_tx_nobuf++; +- /* this shouldn't happen, but don't send first ff either */ +- ieee80211_dev_kfree_skb(&skb); +- } +- } else if (skb_headroom(skb2) < inter_headroom) { +- struct sk_buff *tmp = skb2; ++ if ((skb_cloned(skb2) || ++ (inter_headroom > skb_headroom(skb2)) || ++ (need_tailroom > skb_tailroom(skb2)))) { + +- skb2 = skb_realloc_headroom(skb2, inter_headroom); +- if (skb2 == NULL) { ++ if (pskb_expand_head(skb2, inter_headroom, ++ need_tailroom, GFP_ATOMIC)) { + IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT, +- "%s: cannot expand storage (head2)\n", +- __func__); ++ "%s: cannot expand storage (tail)\n", __func__); + vap->iv_stats.is_tx_nobuf++; +- /* this shouldn't happen, but don't send first ff either */ + ieee80211_dev_kfree_skb(&skb); +- skb = NULL; +- } else +- ieee80211_skb_copy_noderef(tmp, skb); +- ieee80211_dev_kfree_skb(&tmp); +- } +- if (skb) { +- skb->next = skb2; ++ ieee80211_dev_kfree_skb(&skb2); ++ return NULL; ++ } + } +- return skb; ++ skb->next = skb2; + } + #endif /* ATH_SUPERG_FF */ +- if (skb == NULL) { +- IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT, +- "%s: cannot unshare for encapsulation\n", __func__); +- vap->iv_stats.is_tx_nobuf++; +- } else if (skb_tailroom(skb) < need_tailroom) { +- int n = 0; +- if (need_headroom > skb_headroom(skb)) +- n = need_headroom - skb_headroom(skb); +- if (pskb_expand_head(skb, n, need_tailroom - +- skb_tailroom(skb), GFP_ATOMIC)) { +- IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT, +- "%s: cannot expand storage (tail)\n", __func__); +- vap->iv_stats.is_tx_nobuf++; +- ieee80211_dev_kfree_skb(&skb); +- } +- } else if (skb_headroom(skb) < need_headroom) { +- struct sk_buff *tmp = skb; +- skb = skb_realloc_headroom(skb, need_headroom); +- /* Increment reference count after copy */ +- if (skb == NULL) { +- IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT, +- "%s: cannot expand storage (head)\n", __func__); +- vap->iv_stats.is_tx_nobuf++; +- } else +- ieee80211_skb_copy_noderef(tmp, skb); +- ieee80211_dev_kfree_skb(&tmp); +- } + + return skb; + } +Index: madwifi-trunk-r3314/net80211/ieee80211_input.c +=================================================================== +--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c 2008-04-17 18:17:28.000000000 +0200 ++++ madwifi-trunk-r3314/net80211/ieee80211_input.c 2008-04-17 18:25:48.000000000 +0200 +@@ -244,20 +244,6 @@ + vap->iv_stats.is_rx_tooshort++; + goto out; + } +- /* Clone the SKB... we assume somewhere in this driver that we 'own' +- * the skbuff passed into hard start and we do a lot of messing with it +- * but bridges under some cases will not clone for the first pass of skb +- * to a bridge port, but will then clone for subsequent ones. This is +- * odd behavior but it means that if we have trashed the skb we are given +- * then other ports get clones of the residual garbage. +- */ +- if ((skb2 = skb_copy(skb, GFP_ATOMIC)) == NULL) { +- vap->iv_devstats.tx_dropped++; +- goto out; +- } +- ieee80211_skb_copy_noderef(skb, skb2); +- ieee80211_dev_kfree_skb(&skb); +- skb = skb2; + + /* + * Bit of a cheat here, we use a pointer for a 3-address +@@ -738,7 +724,7 @@ + /* ether_type must be length as FF frames are always LLC/SNAP encap'd */ + frame_len = ntohs(eh_tmp->ether_type); + +- skb1 = skb_copy(skb, GFP_ATOMIC); ++ skb1 = skb_clone(skb, GFP_ATOMIC); + if (skb1 == NULL) + goto err; + ieee80211_skb_copy_noderef(skb, skb1); +@@ -1137,7 +1123,7 @@ + + if (ETHER_IS_MULTICAST(eh->ether_dhost) && !netif_queue_stopped(dev)) { + /* Create a SKB for the BSS to send out. */ +- skb1 = skb_copy(skb, GFP_ATOMIC); ++ skb1 = skb_clone(skb, GFP_ATOMIC); + if (skb1) + SKB_CB(skb1)->ni = ieee80211_ref_node(vap->iv_bss); + } diff --git a/package/madwifi/patches/343-txqueue_races.patch b/package/madwifi/patches/343-txqueue_races.patch new file mode 100644 index 00000000000..be6b488d47e --- /dev/null +++ b/package/madwifi/patches/343-txqueue_races.patch @@ -0,0 +1,38 @@ +Merged from madwifi trunk r3551, r3552 + +Index: madwifi-trunk-r3314/ath/if_ath.c +=================================================================== +--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-04-20 23:18:52.000000000 +0200 ++++ madwifi-trunk-r3314/ath/if_ath.c 2008-04-20 23:20:36.000000000 +0200 +@@ -8245,6 +8245,17 @@ + goto bf_fail; + } + ++ /* We make sure we don't remove the TX descriptor on ++ * which the HW is pointing since it contains the ++ * ds_link field, except if this is the last TX ++ * descriptor in the queue */ ++ ++ if ((txq->axq_depth > 1) && ++ (bf->bf_daddr == ath_hal_gettxbuf(ah, txq->axq_qnum))) { ++ ATH_TXQ_UNLOCK_IRQ_EARLY(txq); ++ goto bf_fail; ++ } ++ + ATH_TXQ_REMOVE_HEAD(txq, bf_list); + ATH_TXQ_UNLOCK_IRQ(txq); + +Index: madwifi-trunk-r3314/ath/if_athvar.h +=================================================================== +--- madwifi-trunk-r3314.orig/ath/if_athvar.h 2008-04-20 23:18:48.000000000 +0200 ++++ madwifi-trunk-r3314/ath/if_athvar.h 2008-04-20 23:21:12.000000000 +0200 +@@ -586,7 +586,8 @@ + } while (0) + #define ATH_TXQ_REMOVE_HEAD(_tq, _field) do { \ + STAILQ_REMOVE_HEAD(&(_tq)->axq_q, _field); \ +- (_tq)->axq_depth--; \ ++ if (--(_tq)->axq_depth <= 0) \ ++ (_tq)->axq_link = NULL; \ + } while (0) + /* move buffers from MCASTQ to CABQ */ + #define ATH_TXQ_MOVE_MCASTQ(_tqs,_tqd) do { \ diff --git a/package/madwifi/patches/344-minstrel_failcnt.patch b/package/madwifi/patches/344-minstrel_failcnt.patch new file mode 100644 index 00000000000..b588aec0c35 --- /dev/null +++ b/package/madwifi/patches/344-minstrel_failcnt.patch @@ -0,0 +1,13 @@ +Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c +=================================================================== +--- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c 2008-04-21 00:51:15.000000000 +0200 ++++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c 2008-04-21 02:41:27.000000000 +0200 +@@ -475,7 +475,7 @@ + /* 'tries' is the total number of times we have endeavoured to + * send this packet, and is a sum of the #attempts at each + * level in the multi-rate retry chain */ +- tries = ts->ts_shortretry + ts->ts_longretry + 1; ++ tries = ts->ts_longretry + 1; + + if (sn->num_rates <= 0) { + DPRINTF(sc, "%s: " MAC_FMT " %s no rates yet\n", dev_info, diff --git a/package/madwifi/patches/345-minstrel_sampling.patch b/package/madwifi/patches/345-minstrel_sampling.patch new file mode 100644 index 00000000000..ea4c25f3ada --- /dev/null +++ b/package/madwifi/patches/345-minstrel_sampling.patch @@ -0,0 +1,76 @@ +Index: madwifi-trunk-r3314/ath/if_ath.c +=================================================================== +--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-04-21 02:44:23.000000000 +0200 ++++ madwifi-trunk-r3314/ath/if_ath.c 2008-04-21 03:33:02.000000000 +0200 +@@ -8095,6 +8095,7 @@ + ath_hal_setupxtxdesc(sc->sc_ah, ds, mrr.rate1, mrr.retries1, + mrr.rate2, mrr.retries2, + mrr.rate3, mrr.retries3); ++ bf->rcflags = mrr.privflags; + } + + #ifndef ATH_SUPERG_FF +Index: madwifi-trunk-r3314/ath/if_athvar.h +=================================================================== +--- madwifi-trunk-r3314.orig/ath/if_athvar.h 2008-04-21 00:50:13.000000000 +0200 ++++ madwifi-trunk-r3314/ath/if_athvar.h 2008-04-21 03:31:48.000000000 +0200 +@@ -446,6 +446,7 @@ + u_int16_t bf_flags; /* tx descriptor flags */ + u_int64_t bf_tsf; + int16_t bf_channoise; ++ unsigned int rcflags; + #ifdef ATH_SUPERG_FF + /* XXX: combine this with bf_skbaddr if it ever changes to accommodate + * multiple segments. +Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c +=================================================================== +--- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c 2008-04-21 02:50:31.000000000 +0200 ++++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c 2008-04-21 04:08:36.000000000 +0200 +@@ -336,7 +336,7 @@ + sn->packet_count++; + sn->random_n = (sn->a * sn->random_n) + sn->b; + offset = sn->random_n & 0xf; +- if ((((100 * sn->sample_count) / (sn->sample_count + sn->packet_count)) < ath_lookaround_rate) && (offset < 2)) { ++ if ((((100 * sn->sample_count) / (sn->packet_count ?: 1)) < ath_lookaround_rate) && (offset < 2)) { + sn->sample_count++; + sn->is_sampling = 1; + if (sn->packet_count >= 10000) { +@@ -398,11 +398,14 @@ + if (sn->num_rates <= 0) + return; + ++ mrr->privflags = sn->is_sampling; + if (sn->is_sampling) { + sn->is_sampling = 0; +- if (sn->rs_sample_rate_slower) ++ if (sn->rs_sample_rate_slower) { + rc1 = sn->rs_sample_rate; +- else ++ if (sn->sample_count > 0) ++ sn->sample_count--; ++ } else + rc1 = sn->max_tp_rate; + } else { + rc1 = sn->max_tp_rate2; +@@ -525,6 +528,9 @@ + if (tries <= tries1) + return; + ++ if (bf->rcflags) ++ sn->sample_count++; ++ + if (tries2 < 0) + return; + tries = tries - tries1; +Index: madwifi-trunk-r3314/net80211/ieee80211_rate.h +=================================================================== +--- madwifi-trunk-r3314.orig/net80211/ieee80211_rate.h 2008-01-31 03:29:42.000000000 +0100 ++++ madwifi-trunk-r3314/net80211/ieee80211_rate.h 2008-04-21 03:30:25.000000000 +0200 +@@ -87,6 +87,7 @@ + int retries2; + int rate3; + int retries3; ++ int privflags; + }; + + struct ieee80211_rate_ops { diff --git a/package/madwifi/patches/350-performance.patch b/package/madwifi/patches/350-performance.patch deleted file mode 100644 index 0297e0cdfb2..00000000000 --- a/package/madwifi/patches/350-performance.patch +++ /dev/null @@ -1,230 +0,0 @@ -Index: madwifi-trunk-r3314/ath/if_ath.c -=================================================================== ---- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-04-17 18:17:28.000000000 +0200 -+++ madwifi-trunk-r3314/ath/if_ath.c 2008-04-17 18:17:28.000000000 +0200 -@@ -3237,7 +3237,6 @@ - struct ath_softc *sc = dev->priv; - struct ieee80211_node *ni = NULL; - struct ath_buf *bf = NULL; -- struct ether_header *eh; - ath_bufhead bf_head; - struct ath_buf *tbf, *tempbf; - struct sk_buff *tskb; -@@ -3249,6 +3248,7 @@ - */ - int requeue = 0; - #ifdef ATH_SUPERG_FF -+ struct ether_header *eh; - unsigned int pktlen; - struct ieee80211com *ic = &sc->sc_ic; - struct ath_node *an; -@@ -3314,27 +3314,9 @@ - requeue = 1; - goto hardstart_fail; - } --#endif - -- /* If the skb data is shared, we will copy it so we can strip padding -- * without affecting any other bridge ports. */ -- if (skb_cloned(skb)) { -- /* Remember the original SKB so we can free up our references */ -- struct sk_buff *skb_new; -- skb_new = skb_copy(skb, GFP_ATOMIC); -- if (skb_new == NULL) { -- DPRINTF(sc, ATH_DEBUG_XMIT, -- "Dropping; skb_copy failure.\n"); -- /* No free RAM, do not requeue! */ -- goto hardstart_fail; -- } -- ieee80211_skb_copy_noderef(skb, skb_new); -- ieee80211_dev_kfree_skb(&skb); -- skb = skb_new; -- } - eh = (struct ether_header *)skb->data; - --#ifdef ATH_SUPERG_FF - /* NB: use this lock to protect an->an_tx_ffbuf (and txq->axq_stageq) - * in athff_can_aggregate() call too. */ - ATH_TXQ_LOCK_IRQ(txq); -Index: madwifi-trunk-r3314/net80211/ieee80211_output.c -=================================================================== ---- madwifi-trunk-r3314.orig/net80211/ieee80211_output.c 2008-04-17 18:17:27.000000000 +0200 -+++ madwifi-trunk-r3314/net80211/ieee80211_output.c 2008-04-17 18:18:04.000000000 +0200 -@@ -283,7 +283,7 @@ - * normal vap. */ - if (vap->iv_xrvap && (ni == vap->iv_bss) && - vap->iv_xrvap->iv_sta_assoc) { -- struct sk_buff *skb1 = skb_copy(skb, GFP_ATOMIC); -+ struct sk_buff *skb1 = skb_clone(skb, GFP_ATOMIC); - if (skb1) { - memset(SKB_CB(skb1), 0, sizeof(struct ieee80211_cb)); - #ifdef IEEE80211_DEBUG_REFCNT -@@ -615,100 +615,45 @@ - skb = skb_unshare(skb, GFP_ATOMIC); - } - --#ifdef ATH_SUPERG_FF -- if (isff) { -- if (skb == NULL) { -+ if (skb_cloned(skb) || -+ (need_headroom > skb_headroom(skb)) || -+ (!isff && (need_tailroom > skb_tailroom(skb)))) { -+ -+ if (pskb_expand_head(skb, need_headroom, need_tailroom, GFP_ATOMIC)) { - IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT, -- "%s: cannot unshare for encapsulation\n", -- __func__); -+ "%s: cannot expand storage (tail)\n", __func__); - vap->iv_stats.is_tx_nobuf++; -- ieee80211_dev_kfree_skb(&skb2); -- -+ ieee80211_dev_kfree_skb(&skb); - return NULL; - } -+ } - -- /* first skb header */ -- if (skb_headroom(skb) < need_headroom) { -- struct sk_buff *tmp = skb; -- skb = skb_realloc_headroom(skb, need_headroom); -- if (skb == NULL) { -- IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT, -- "%s: cannot expand storage (head1)\n", -- __func__); -- vap->iv_stats.is_tx_nobuf++; -- ieee80211_dev_kfree_skb(&skb2); -- return NULL; -- } else -- ieee80211_skb_copy_noderef(tmp, skb); -- ieee80211_dev_kfree_skb(&tmp); -- /* NB: cb[] area was copied, but not next ptr. must do that -- * prior to return on success. */ -+#ifdef ATH_SUPERG_FF -+ if (isff) { -+ if (skb_shared(skb2)) { -+ /* Take our own reference to the node in the clone */ -+ ieee80211_ref_node(SKB_CB(skb2)->ni); -+ /* Unshare the node, decrementing users in the old skb */ -+ skb2 = skb_unshare(skb2, GFP_ATOMIC); - } - -- /* second skb with header and tail adjustments possible */ -- if (skb_tailroom(skb2) < need_tailroom) { -- int n = 0; -- if (inter_headroom > skb_headroom(skb2)) -- n = inter_headroom - skb_headroom(skb2); -- if (pskb_expand_head(skb2, n, -- need_tailroom - skb_tailroom(skb2), GFP_ATOMIC)) { -- ieee80211_dev_kfree_skb(&skb2); -- IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT, -- "%s: cannot expand storage (tail2)\n", -- __func__); -- vap->iv_stats.is_tx_nobuf++; -- /* this shouldn't happen, but don't send first ff either */ -- ieee80211_dev_kfree_skb(&skb); -- } -- } else if (skb_headroom(skb2) < inter_headroom) { -- struct sk_buff *tmp = skb2; -+ if ((skb_cloned(skb2) || -+ (inter_headroom > skb_headroom(skb2)) || -+ (need_tailroom > skb_tailroom(skb2)))) { - -- skb2 = skb_realloc_headroom(skb2, inter_headroom); -- if (skb2 == NULL) { -+ if (pskb_expand_head(skb2, inter_headroom, -+ need_tailroom, GFP_ATOMIC)) { - IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT, -- "%s: cannot expand storage (head2)\n", -- __func__); -+ "%s: cannot expand storage (tail)\n", __func__); - vap->iv_stats.is_tx_nobuf++; -- /* this shouldn't happen, but don't send first ff either */ - ieee80211_dev_kfree_skb(&skb); -- skb = NULL; -- } else -- ieee80211_skb_copy_noderef(tmp, skb); -- ieee80211_dev_kfree_skb(&tmp); -- } -- if (skb) { -- skb->next = skb2; -+ ieee80211_dev_kfree_skb(&skb2); -+ return NULL; -+ } - } -- return skb; -+ skb->next = skb2; - } - #endif /* ATH_SUPERG_FF */ -- if (skb == NULL) { -- IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT, -- "%s: cannot unshare for encapsulation\n", __func__); -- vap->iv_stats.is_tx_nobuf++; -- } else if (skb_tailroom(skb) < need_tailroom) { -- int n = 0; -- if (need_headroom > skb_headroom(skb)) -- n = need_headroom - skb_headroom(skb); -- if (pskb_expand_head(skb, n, need_tailroom - -- skb_tailroom(skb), GFP_ATOMIC)) { -- IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT, -- "%s: cannot expand storage (tail)\n", __func__); -- vap->iv_stats.is_tx_nobuf++; -- ieee80211_dev_kfree_skb(&skb); -- } -- } else if (skb_headroom(skb) < need_headroom) { -- struct sk_buff *tmp = skb; -- skb = skb_realloc_headroom(skb, need_headroom); -- /* Increment reference count after copy */ -- if (skb == NULL) { -- IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT, -- "%s: cannot expand storage (head)\n", __func__); -- vap->iv_stats.is_tx_nobuf++; -- } else -- ieee80211_skb_copy_noderef(tmp, skb); -- ieee80211_dev_kfree_skb(&tmp); -- } - - return skb; - } -Index: madwifi-trunk-r3314/net80211/ieee80211_input.c -=================================================================== ---- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c 2008-04-17 18:17:28.000000000 +0200 -+++ madwifi-trunk-r3314/net80211/ieee80211_input.c 2008-04-17 18:25:48.000000000 +0200 -@@ -244,20 +244,6 @@ - vap->iv_stats.is_rx_tooshort++; - goto out; - } -- /* Clone the SKB... we assume somewhere in this driver that we 'own' -- * the skbuff passed into hard start and we do a lot of messing with it -- * but bridges under some cases will not clone for the first pass of skb -- * to a bridge port, but will then clone for subsequent ones. This is -- * odd behavior but it means that if we have trashed the skb we are given -- * then other ports get clones of the residual garbage. -- */ -- if ((skb2 = skb_copy(skb, GFP_ATOMIC)) == NULL) { -- vap->iv_devstats.tx_dropped++; -- goto out; -- } -- ieee80211_skb_copy_noderef(skb, skb2); -- ieee80211_dev_kfree_skb(&skb); -- skb = skb2; - - /* - * Bit of a cheat here, we use a pointer for a 3-address -@@ -738,7 +724,7 @@ - /* ether_type must be length as FF frames are always LLC/SNAP encap'd */ - frame_len = ntohs(eh_tmp->ether_type); - -- skb1 = skb_copy(skb, GFP_ATOMIC); -+ skb1 = skb_clone(skb, GFP_ATOMIC); - if (skb1 == NULL) - goto err; - ieee80211_skb_copy_noderef(skb, skb1); -@@ -1137,7 +1123,7 @@ - - if (ETHER_IS_MULTICAST(eh->ether_dhost) && !netif_queue_stopped(dev)) { - /* Create a SKB for the BSS to send out. */ -- skb1 = skb_copy(skb, GFP_ATOMIC); -+ skb1 = skb_clone(skb, GFP_ATOMIC); - if (skb1) - SKB_CB(skb1)->ni = ieee80211_ref_node(vap->iv_bss); - } diff --git a/package/madwifi/patches/360-txqueue_races.patch b/package/madwifi/patches/360-txqueue_races.patch deleted file mode 100644 index be6b488d47e..00000000000 --- a/package/madwifi/patches/360-txqueue_races.patch +++ /dev/null @@ -1,38 +0,0 @@ -Merged from madwifi trunk r3551, r3552 - -Index: madwifi-trunk-r3314/ath/if_ath.c -=================================================================== ---- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-04-20 23:18:52.000000000 +0200 -+++ madwifi-trunk-r3314/ath/if_ath.c 2008-04-20 23:20:36.000000000 +0200 -@@ -8245,6 +8245,17 @@ - goto bf_fail; - } - -+ /* We make sure we don't remove the TX descriptor on -+ * which the HW is pointing since it contains the -+ * ds_link field, except if this is the last TX -+ * descriptor in the queue */ -+ -+ if ((txq->axq_depth > 1) && -+ (bf->bf_daddr == ath_hal_gettxbuf(ah, txq->axq_qnum))) { -+ ATH_TXQ_UNLOCK_IRQ_EARLY(txq); -+ goto bf_fail; -+ } -+ - ATH_TXQ_REMOVE_HEAD(txq, bf_list); - ATH_TXQ_UNLOCK_IRQ(txq); - -Index: madwifi-trunk-r3314/ath/if_athvar.h -=================================================================== ---- madwifi-trunk-r3314.orig/ath/if_athvar.h 2008-04-20 23:18:48.000000000 +0200 -+++ madwifi-trunk-r3314/ath/if_athvar.h 2008-04-20 23:21:12.000000000 +0200 -@@ -586,7 +586,8 @@ - } while (0) - #define ATH_TXQ_REMOVE_HEAD(_tq, _field) do { \ - STAILQ_REMOVE_HEAD(&(_tq)->axq_q, _field); \ -- (_tq)->axq_depth--; \ -+ if (--(_tq)->axq_depth <= 0) \ -+ (_tq)->axq_link = NULL; \ - } while (0) - /* move buffers from MCASTQ to CABQ */ - #define ATH_TXQ_MOVE_MCASTQ(_tqs,_tqd) do { \ diff --git a/package/madwifi/patches/370-minstrel_failcnt.patch b/package/madwifi/patches/370-minstrel_failcnt.patch deleted file mode 100644 index b588aec0c35..00000000000 --- a/package/madwifi/patches/370-minstrel_failcnt.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c -=================================================================== ---- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c 2008-04-21 00:51:15.000000000 +0200 -+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c 2008-04-21 02:41:27.000000000 +0200 -@@ -475,7 +475,7 @@ - /* 'tries' is the total number of times we have endeavoured to - * send this packet, and is a sum of the #attempts at each - * level in the multi-rate retry chain */ -- tries = ts->ts_shortretry + ts->ts_longretry + 1; -+ tries = ts->ts_longretry + 1; - - if (sn->num_rates <= 0) { - DPRINTF(sc, "%s: " MAC_FMT " %s no rates yet\n", dev_info, diff --git a/package/madwifi/patches/380-minstrel_sampling.patch b/package/madwifi/patches/380-minstrel_sampling.patch deleted file mode 100644 index ea4c25f3ada..00000000000 --- a/package/madwifi/patches/380-minstrel_sampling.patch +++ /dev/null @@ -1,76 +0,0 @@ -Index: madwifi-trunk-r3314/ath/if_ath.c -=================================================================== ---- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-04-21 02:44:23.000000000 +0200 -+++ madwifi-trunk-r3314/ath/if_ath.c 2008-04-21 03:33:02.000000000 +0200 -@@ -8095,6 +8095,7 @@ - ath_hal_setupxtxdesc(sc->sc_ah, ds, mrr.rate1, mrr.retries1, - mrr.rate2, mrr.retries2, - mrr.rate3, mrr.retries3); -+ bf->rcflags = mrr.privflags; - } - - #ifndef ATH_SUPERG_FF -Index: madwifi-trunk-r3314/ath/if_athvar.h -=================================================================== ---- madwifi-trunk-r3314.orig/ath/if_athvar.h 2008-04-21 00:50:13.000000000 +0200 -+++ madwifi-trunk-r3314/ath/if_athvar.h 2008-04-21 03:31:48.000000000 +0200 -@@ -446,6 +446,7 @@ - u_int16_t bf_flags; /* tx descriptor flags */ - u_int64_t bf_tsf; - int16_t bf_channoise; -+ unsigned int rcflags; - #ifdef ATH_SUPERG_FF - /* XXX: combine this with bf_skbaddr if it ever changes to accommodate - * multiple segments. -Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c -=================================================================== ---- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c 2008-04-21 02:50:31.000000000 +0200 -+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c 2008-04-21 04:08:36.000000000 +0200 -@@ -336,7 +336,7 @@ - sn->packet_count++; - sn->random_n = (sn->a * sn->random_n) + sn->b; - offset = sn->random_n & 0xf; -- if ((((100 * sn->sample_count) / (sn->sample_count + sn->packet_count)) < ath_lookaround_rate) && (offset < 2)) { -+ if ((((100 * sn->sample_count) / (sn->packet_count ?: 1)) < ath_lookaround_rate) && (offset < 2)) { - sn->sample_count++; - sn->is_sampling = 1; - if (sn->packet_count >= 10000) { -@@ -398,11 +398,14 @@ - if (sn->num_rates <= 0) - return; - -+ mrr->privflags = sn->is_sampling; - if (sn->is_sampling) { - sn->is_sampling = 0; -- if (sn->rs_sample_rate_slower) -+ if (sn->rs_sample_rate_slower) { - rc1 = sn->rs_sample_rate; -- else -+ if (sn->sample_count > 0) -+ sn->sample_count--; -+ } else - rc1 = sn->max_tp_rate; - } else { - rc1 = sn->max_tp_rate2; -@@ -525,6 +528,9 @@ - if (tries <= tries1) - return; - -+ if (bf->rcflags) -+ sn->sample_count++; -+ - if (tries2 < 0) - return; - tries = tries - tries1; -Index: madwifi-trunk-r3314/net80211/ieee80211_rate.h -=================================================================== ---- madwifi-trunk-r3314.orig/net80211/ieee80211_rate.h 2008-01-31 03:29:42.000000000 +0100 -+++ madwifi-trunk-r3314/net80211/ieee80211_rate.h 2008-04-21 03:30:25.000000000 +0200 -@@ -87,6 +87,7 @@ - int retries2; - int rate3; - int retries3; -+ int privflags; - }; - - struct ieee80211_rate_ops {