wireless: clean up radiotap a bit

No need to pad the header so no constant needed for that,
no need to carry any version number from netbsd nor CVS
IDs from them.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 3 insertions, 21 deletions

diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index d2a2b7586d08..48fa6df3a774 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -7797,15 +7797,6 @@ static void ipw_handle_data_packet_monitor(struct ipw_priv *priv,
         memmove(rxb->skb->data + sizeof(struct ipw_rt_hdr),
                 rxb->skb->data + IPW_RX_FRAME_SIZE, len);
 
-        /* Zero the radiotap static buffer  ...  We only need to zero the bytes NOT
-         * part of our real header, saves a little time.
-         *
-         * No longer necessary since we fill in all our data.  Purge before merging
-         * patch officially.
-         * memset(rxb->skb->data + sizeof(struct ipw_rt_hdr), 0,
-         *        IEEE80211_RADIOTAP_HDRLEN - sizeof(struct ipw_rt_hdr));
-         */
-
         ipw_rt = (struct ipw_rt_hdr *)rxb->skb->data;
 
         ipw_rt->rt_hdr.it_version = PKTHDR_RADIOTAP_VERSION;
@@ -8013,15 +8004,6 @@ static void ipw_handle_promiscuous_rx(struct ipw_priv *priv,
 
         memcpy(ipw_rt->payload, hdr, len);
 
-        /* Zero the radiotap static buffer  ...  We only need to zero the bytes
-         * NOT part of our real header, saves a little time.
-         *
-         * No longer necessary since we fill in all our data.  Purge before
-         * merging patch officially.
-         * memset(rxb->skb->data + sizeof(struct ipw_rt_hdr), 0,
-         *        IEEE80211_RADIOTAP_HDRLEN - sizeof(struct ipw_rt_hdr));
-         */
-
         ipw_rt->rt_hdr.it_version = PKTHDR_RADIOTAP_VERSION;
         ipw_rt->rt_hdr.it_pad = 0;      /* always good to zero */
         ipw_rt->rt_hdr.it_len = cpu_to_le16(sizeof(*ipw_rt));   /* total header+data */
@@ -10409,9 +10391,9 @@ static void ipw_handle_promiscuous_tx(struct ipw_priv *priv,
                 } else
                         len = src->len;
 
-                dst = alloc_skb(
-                        len + IEEE80211_RADIOTAP_HDRLEN, GFP_ATOMIC);
-                if (!dst) continue;
+                dst = alloc_skb(len + sizeof(*rt_hdr), GFP_ATOMIC);
+                if (!dst)
+                        continue;
 
                 rt_hdr = (void *)skb_put(dst, sizeof(*rt_hdr));