X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fmadwifi%2Fpatches%2F372-queue_vif.patch;h=83576c8e6ce06b097902af63befbdae9b73af014;hb=c1fc2dd11eb3febaa96570aca5b4da2aa5d70663;hp=a73b9ec582ec8e000850ba5e395649dada68a8a4;hpb=46c00b4f555787a02819801863a0055ca0871652;p=openwrt-10.03%2F.git

diff --git a/package/madwifi/patches/372-queue_vif.patch b/package/madwifi/patches/372-queue_vif.patch
index a73b9ec58..83576c8e6 100644
--- a/package/madwifi/patches/372-queue_vif.patch
+++ b/package/madwifi/patches/372-queue_vif.patch
@@ -1,6 +1,6 @@
 --- a/net80211/ieee80211_input.c
 +++ b/net80211/ieee80211_input.c
-@@ -1183,6 +1183,7 @@
+@@ -1199,6 +1199,7 @@
  		}
  		if (skb1 != NULL) {
  			struct ieee80211_node *ni_tmp;
@@ -8,7 +8,7 @@
  			skb1->dev = dev;
  			skb_reset_mac_header(skb1);
  			skb_set_network_header(skb1, sizeof(struct ether_header));
-@@ -1190,7 +1191,12 @@
+@@ -1206,7 +1207,12 @@
  			skb1->protocol = __constant_htons(ETH_P_802_2);
  			/* XXX insert vlan tag before queue it? */
  			ni_tmp = SKB_CB(skb1)->ni; /* remember node so we can free it */
@@ -18,13 +18,13 @@
 +			if (ret == NETDEV_TX_BUSY)
 +				ieee80211_dev_kfree_skb(&skb1);
 +
-+			if (ret != NETDEV_TX_OK) {
++			else if (ret != NETDEV_TX_OK) {
  				/* If queue dropped the packet because device was
  				 * too busy */
  				vap->iv_devstats.tx_dropped++;
 --- a/net80211/ieee80211_output.c
 +++ b/net80211/ieee80211_output.c
-@@ -329,9 +329,10 @@
+@@ -333,9 +333,10 @@
  	/* Dispatch the packet to the parent device */
  	skb->dev = vap->iv_ic->ic_dev;