Ticket #417: madwifi-parent_queue.2.diff

net80211/ieee80211_input.c

@@ -53 +53 @@
-#include "if_athproto.h"
-
-#include <net80211/ieee80211_var.h>
+#include <net80211/ieee80211_proto.h>
-
-#ifdef IEEE80211_DEBUG
-/*
@@ -3317 +3318 @@
-                        vap->iv_set_tim(ni, 0);
-        }
-        M_PWR_SAV_SET(skb);             /* bypass PS handling */
-skb->dev = vap->iv_dev;                /* XXX needed? */
-(void) dev_queue_xmit(skb);    /* resubmit
+
+ieee80211_parent_queue_xmit(skb);      /* Submit to parent device, including updating stats
-}
-
-#ifdef ATH_SUPERG_FF

net80211/ieee80211_output.c

@@ -252 +252 @@
-                        "%s: discard, classification failure", __func__);
-                goto bad;
-        }
+        
+        cb->ni = ni;
+        skb->dev = parent;
+        
-        /* power-save checks */
-        if (WME_UAPSD_AC_CAN_TRIGGER(skb->priority, ni)) {
-                /* U-APSD power save queue */
-                /* XXXAPSD: assuming triggerable means deliverable */
-                M_FLAG_SET(skb, M_UAPSD);
- && !M_PWR_SAV_GET(skb)
+
-                /*
-                 * Station in power save mode; stick the frame
-                 * on the sta's power save queue and continue.
@@ -266 +270 @@
-                ieee80211_pwrsave(ni, skb);
-                goto reclaim;
-        }
-        M_FLAG_KEEP_ONLY(skb, M_UAPSD | M_PWR_SAV);
-        cb->ni = ni;
-
-        vap->iv_devstats.tx_packets++;
-        vap->iv_devstats.tx_bytes += skb->len;
-        ic->ic_lastdata = jiffies;
-
-        skb->dev = parent;
-#ifdef ATH_SUPERG_XR
-        /* 
-         * broadcast/multicast  packets need to be sent on XR vap in addition to
@@ -293 +290 @@
-                }
-        }
-#endif
-(void) dev
+ieee80211_parent
-        return 0;
-bad:
-        if (skb != NULL)
@@ -304 +301 @@
-        return 0;
-}
-
+void ieee80211_parent_queue_xmit(struct sk_buff *skb) {
+        struct ieee80211vap *vap = skb->dev->priv;
+        struct ieee80211com *ic = vap->iv_ic;
+
+        vap->iv_devstats.tx_packets++;
+        vap->iv_devstats.tx_bytes += skb->len;
+        ic->ic_lastdata = jiffies;
+
+        (void) dev_queue_xmit(skb);
+}
+
-/*
- * Set the direction field and address fields of an outgoing
- * non-QoS frame.  Note this should be called early on in

net80211/ieee80211_power.c

@@ -48 +48 @@
-#include "if_media.h"
-
-#include <net80211/ieee80211_var.h>
+#include <net80211/ieee80211_proto.h>
-
-static void ieee80211_set_tim(struct ieee80211_node *ni, int set);
-
@@ -316 +317 @@
-#else
-                skb->dev = vap->iv_dev;         /* XXX? unnecessary */
-#endif
-
+
+
-        }
-        vap->iv_set_tim(ni, 0);
-}

net80211/ieee80211_proto.h

@@ -72 +72 @@
-        int, int, u_int32_t);
-void ieee80211_sta_pwrsave(struct ieee80211vap *, int);
-int ieee80211_hardstart(struct sk_buff *, struct net_device *);
+void ieee80211_parent_queue_xmit(struct sk_buff *);
-int ieee80211_send_nulldata(struct ieee80211_node *);
-int ieee80211_send_qosnulldata(struct ieee80211_node *, int);
-int ieee80211_send_mgmt(struct ieee80211_node *, int, int);