Ticket #907: madwifi-parent.6.diff

net80211/ieee80211_input.c

@@ -53 +53 @@
-#include "if_athproto.h"
-
-#include <net80211/ieee80211_var.h>
+#include <net80211/ieee80211_proto.h>
-
-#ifdef IEEE80211_DEBUG
-/*
@@ -3316 +3317 @@
-                if (vap->iv_set_tim != NULL)
-                        vap->iv_set_tim(ni, 0);
-        }
-bypass PS handling
-
-       (void) dev_queue_xmit(skb);     /* resubmit
+ensure MORE_DATA bit is set correctly
+
+       ieee80211_parent_queue_xmit(skb);       /* Submit to parent device, including updating stats
-}
-
-#ifdef ATH_SUPERG_FF

net80211/ieee80211_output.c

@@ -226 +226 @@
-        
-        if (vap->iv_opmode == IEEE80211_M_MONITOR) {
-                ieee80211_monitor_encap(vap, skb);
-
-
+
-                return 0;
-        }
-        if (ic->ic_flags & IEEE80211_F_SCAN)            /* cancel bg scan */
@@ -252 +251 @@
-                        "%s: discard, classification failure", __func__);
-                goto bad;
-        }
+        
+        cb->ni = ni;
+        
-        /* 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.
-                 * We'll get the frame back when the time is right.
-                 */
-                ieee80211_pwrsave(ni, skb);
-goto reclaim
+return 0
-        }
-        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
-         * normal vap.
-         */
+
+        /* FIXME: ieee80211_parent_queue_xmit */
-        if (vap->iv_xrvap && ni == vap->iv_bss &&
-            vap->iv_xrvap->iv_sta_assoc) {
-                struct sk_buff *skb1;
@@ -293 +290 @@
-                }
-        }
-#endif
-(void) dev
+ieee80211_parent
-        return 0;
+
-bad:
-        if (skb != NULL)
-                dev_kfree_skb(skb);
-reclaim:
-        if (ni != NULL)
-                ieee80211_free_node(ni);
-        return 0;
-}
-
+void ieee80211_parent_queue_xmit(struct sk_buff *skb) {
+        struct ieee80211vap *vap = skb->dev->priv;
+
+        vap->iv_devstats.tx_packets++;
+        vap->iv_devstats.tx_bytes += skb->len;
+        vap->iv_ic->ic_lastdata = jiffies;
+
+        // Dispatch the packet to the parent device
+        skb->dev = vap->iv_ic->ic_dev;
+        (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);
-
@@ -111 +112 @@
-
-        IEEE80211_NODE_SAVEQ_LOCK(ni);
-        qlen = skb_queue_len(&ni->ni_savedq);
-
+
+
-                dev_kfree_skb_any(skb);
+        }
-        IEEE80211_NODE_SAVEQ_UNLOCK(ni);
-
-        return qlen;
@@ -208 +211 @@
-
-        spin_lock_irqsave(&ni->ni_savedq.lock, flags);
-        if (skb_queue_len(&ni->ni_savedq) >= IEEE80211_PS_MAX_QUEUE) {
-
+ 
-                spin_unlock_irqrestore(&ni->ni_savedq.lock, flags);
-                IEEE80211_NOTE(vap, IEEE80211_MSG_ANY, ni,
-                        "pwr save q overflow, drops %d (size %d)",
@@ -300 +303 @@
-                 *
-                 * Set the M_PWR_SAV bit on skb to allow encap to test for
-                 * adding MORE_DATA bit to wh.
+                 *
+                 * The 802.11 MAC Spec says we should only set MORE_DATA for 
+                 * unicast packets when the STA is in PS mode (7.1.3.1.8);
+                 * which it isn't.
-                 */
-
+// 
-
-#ifdef ATH_SUPERG_XR
-                /*
@@ -313 +320 @@
-                        skb->dev = vap->iv_xrvap->iv_dev;
-                else
-                        skb->dev = vap->iv_dev;         /* XXX? unnecessary */
-#else
-                skb->dev = vap->iv_dev;         /* XXX? unnecessary */
-#endif
-
+
+
-        }
-        vap->iv_set_tim(ni, 0);
-}
@@ -356 +362 @@
-                                IEEE80211_NODE_SAVEQ_UNLOCK(ni);
-                                if (skb == NULL)
-                                        break;
-dev
+ieee80211_parent
-                        }
-                }
-        } else {

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);