Changeset 1719

Timestamp:

09/20/06 03:14:07 (2 years ago)

Author:

kelmo

Message:

In monitor mode, transmitted packets were not having their hardware
padding removed before being sent to ieee80211_input_monitor causing
the frames to appear invalid. This patch removes that padding.

Signed-off-by: Scott Raynel <scottraynel@gmail.com>

Files:

• trunk/ath/if_ath.c (modified) (2 diffs)

trunk/ath/if_ath.c

@@ -5243 +5243 @@
-        struct ath_softc *sc = dev->priv;
-        struct ieee80211com *ic = &sc->sc_ic;
+        struct ieee80211_frame *wh;
-        int extra = A_MAX(sizeof(struct ath_tx_radiotap_header), 
-                          A_MAX(sizeof(wlan_ng_prism2_header), ATHDESC_HEADER_SIZE));
@@ -5261 +5262 @@
-                skb_orphan(skb);
-
+        wh = (struct ieee80211_frame *) skb->data;
+        if (IEEE80211_QOS_HAS_SEQ(wh)) {
+                /* Unlike in rx_capture, we're freeing the skb at the end
+                 * anyway, so we don't need to worry about using a copy */
+                int headersize = ieee80211_hdrsize(wh);
+                int padbytes = roundup(headersize, 4) - headersize;
+                if (padbytes > 0) {
+                        memmove(skb->data + padbytes, skb->data, headersize);
+                        skb_pull(skb, padbytes);
+                }
+        }
+        
-        if (skb_headroom(skb) < extra &&
-            pskb_expand_head(skb, extra, 0, GFP_ATOMIC)) {