aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/tx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-10-07 08:01:24 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-10-11 16:41:18 -0400
commit68f2b517bcbd81cb19321d5ca208d4c0f13b8728 (patch)
tree7613b501332a00bdd43df5a0bcc24d41bd2437fe /net/mac80211/tx.c
parent5d9cf4a5d7d46e412bc43b20c79743d81a0328cb (diff)
mac80211: remove tx_data ethertype
It's set, but never used, so kill it. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r--net/mac80211/tx.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 84ebc3f89123..6f2254a554e7 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1198,7 +1198,7 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata,
1198 struct ieee80211_local *local = sdata->local; 1198 struct ieee80211_local *local = sdata->local;
1199 struct ieee80211_hdr *hdr; 1199 struct ieee80211_hdr *hdr;
1200 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); 1200 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
1201 int hdrlen, tid; 1201 int tid;
1202 u8 *qc; 1202 u8 *qc;
1203 1203
1204 memset(tx, 0, sizeof(*tx)); 1204 memset(tx, 0, sizeof(*tx));
@@ -1295,11 +1295,6 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata,
1295 else if (test_and_clear_sta_flag(tx->sta, WLAN_STA_CLEAR_PS_FILT)) 1295 else if (test_and_clear_sta_flag(tx->sta, WLAN_STA_CLEAR_PS_FILT))
1296 info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT; 1296 info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
1297 1297
1298 hdrlen = ieee80211_hdrlen(hdr->frame_control);
1299 if (skb->len > hdrlen + sizeof(rfc1042_header) + 2) {
1300 u8 *pos = &skb->data[hdrlen + sizeof(rfc1042_header)];
1301 tx->ethertype = (pos[0] << 8) | pos[1];
1302 }
1303 info->flags |= IEEE80211_TX_CTL_FIRST_FRAGMENT; 1298 info->flags |= IEEE80211_TX_CTL_FIRST_FRAGMENT;
1304 1299
1305 return TX_CONTINUE; 1300 return TX_CONTINUE;