]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
adm8211: remove unnecessary protected bit mask/check
authorHarvey Harrison <harvey.harrison@gmail.com>
Sun, 22 Jun 2008 02:33:20 +0000 (19:33 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 26 Jun 2008 20:50:02 +0000 (16:50 -0400)
Removes now unused fc local var and uses the new ieee80211_hdrlen
which directly uses the le16 frame control value.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/adm8211.c

index 0ba55ba9395884570a795632bcd34c1156716d5c..3333d4596b8d1cabcd40dbc8d0ec67c8b588a0fc 100644 (file)
@@ -1685,7 +1685,6 @@ static void adm8211_tx_raw(struct ieee80211_hw *dev, struct sk_buff *skb,
 static int adm8211_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
 {
        struct adm8211_tx_hdr *txhdr;
-       u16 fc;
        size_t payload_len, hdrlen;
        int plcp, dur, len, plcp_signal, short_preamble;
        struct ieee80211_hdr *hdr;
@@ -1696,8 +1695,7 @@ static int adm8211_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
        plcp_signal = txrate->bitrate;
 
        hdr = (struct ieee80211_hdr *)skb->data;
-       fc = le16_to_cpu(hdr->frame_control) & ~IEEE80211_FCTL_PROTECTED;
-       hdrlen = ieee80211_get_hdrlen(fc);
+       hdrlen = ieee80211_hdrlen(hdr->frame_control);
        memcpy(skb->cb, skb->data, hdrlen);
        hdr = (struct ieee80211_hdr *)skb->cb;
        skb_pull(skb, hdrlen);
@@ -1711,8 +1709,6 @@ static int adm8211_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
        txhdr->frame_control = hdr->frame_control;
 
        len = hdrlen + payload_len + FCS_LEN;
-       if (fc & IEEE80211_FCTL_PROTECTED)
-               len += 8;
 
        txhdr->frag = cpu_to_le16(0x0FFF);
        adm8211_calc_durations(&dur, &plcp, payload_len,
@@ -1730,9 +1726,6 @@ static int adm8211_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
        if (info->flags & IEEE80211_TX_CTL_USE_RTS_CTS)
                txhdr->header_control |= cpu_to_le16(ADM8211_TXHDRCTL_ENABLE_RTS);
 
-       if (fc & IEEE80211_FCTL_PROTECTED)
-               txhdr->header_control |= cpu_to_le16(ADM8211_TXHDRCTL_ENABLE_WEP_ENGINE);
-
        txhdr->retry_limit = info->control.retry_limit;
 
        adm8211_tx_raw(dev, skb, plcp_signal, hdrlen);