Re: "Stable" branch of mac80211

[Michael Wu <flamingice@sourmilk.net>]

[-- Attachment #1.1: Type: text/plain, Size: 679 bytes --]

On Sunday 29 April 2007 13:48, Jiri Benc wrote:
> Please note that this branch is expected to be rebased frequently and all
> patches are subject to change.
>
wireless-dev has been updated recently. One of the conflicts can be resolved 
easily. There's also an API change which conflicts with the qdisc fixes 
because tcf_destroy is no longer exported. A patch for that is attached.

Once updated to the latest wireless-dev, it should be fairly easy to pull 
together a patch for net-2.6 since wireless-dev should have all the major 
networking API changes for 2.6.22. I think mac80211 can be pushed to net-2.6 
after that. What do you think?

Thanks,
-Michael Wu

[-- Attachment #1.2: 19-fix-tcf-api-update.diff --]
[-- Type: text/x-diff, Size: 992 bytes --]

mac80211: update qdisc code to use tcf_destroy_chain

From: Michael Wu <flamingice@sourmilk.net>

tcf_destroy is no longer exported. Use tcf_destroy_chain instead.

Signed-off-by: Michael Wu <flamingice@sourmilk.net>
---

 net/mac80211/wme.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
index 1cb6358..9874d9a 100644
--- a/net/mac80211/wme.c
+++ b/net/mac80211/wme.c
@@ -354,13 +354,10 @@ static void wme_qdiscop_destroy(struct Qdisc* qd)
 	struct ieee80211_sched_data *q = qdisc_priv(qd);
 	struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);
 	struct ieee80211_hw *hw = &local->hw;
-	struct tcf_proto *tp;
 	int queue;
 
-	while ((tp = q->filter_list) != NULL) {
-		q->filter_list = tp->next;
-		tcf_destroy(tp);
-	}
+	tcf_destroy_chain(q->filter_list);
+	q->filter_list = NULL;
 
 	for (queue=0; queue < hw->queues; queue++) {
 		skb_queue_purge(&q->requeued[queue]);

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]