From: Johannes Berg <johannes.berg@xxxxxxxxx>
It's set, but never used, so kill it.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
---
net/mac80211/ieee80211_i.h | 1 -
net/mac80211/tx.c | 7 +------
2 files changed, 1 insertion(+), 7 deletions(-)
--- a/net/mac80211/ieee80211_i.h 2011-10-07 10:08:27.000000000 +0200
+++ b/net/mac80211/ieee80211_i.h 2011-10-07 10:23:10.000000000 +0200
@@ -149,7 +149,6 @@ struct ieee80211_tx_data {
struct ieee80211_channel *channel;
- u16 ethertype;
unsigned int flags;
};
--- a/net/mac80211/tx.c 2011-10-07 10:17:04.000000000 +0200
+++ b/net/mac80211/tx.c 2011-10-07 10:24:37.000000000 +0200
@@ -1198,7 +1198,7 @@ ieee80211_tx_prepare(struct ieee80211_su
struct ieee80211_local *local = sdata->local;
struct ieee80211_hdr *hdr;
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
- int hdrlen, tid;
+ int tid;
u8 *qc;
memset(tx, 0, sizeof(*tx));
@@ -1295,11 +1295,6 @@ ieee80211_tx_prepare(struct ieee80211_su
else if (test_and_clear_sta_flag(tx->sta, WLAN_STA_CLEAR_PS_FILT))
info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
- hdrlen = ieee80211_hdrlen(hdr->frame_control);
- if (skb->len > hdrlen + sizeof(rfc1042_header) + 2) {
- u8 *pos = &skb->data[hdrlen + sizeof(rfc1042_header)];
- tx->ethertype = (pos[0] << 8) | pos[1];
- }
info->flags |= IEEE80211_TX_CTL_FIRST_FRAGMENT;
return TX_CONTINUE;
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
