Skip to content

Commit

Permalink
mac80211: remove tx_data ethertype
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Johannes Berg authored and John W. Linville committed Oct 11, 2011
1 parent 5d9cf4a commit 68f2b51
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
1 change: 0 additions & 1 deletion net/mac80211/ieee80211_i.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ struct ieee80211_tx_data {

struct ieee80211_channel *channel;

u16 ethertype;
unsigned int flags;
};

Expand Down
7 changes: 1 addition & 6 deletions net/mac80211/tx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1198,7 +1198,7 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata,
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));
Expand Down Expand Up @@ -1295,11 +1295,6 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata,
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;
Expand Down

0 comments on commit 68f2b51

Please sign in to comment.