diff options
-rw-r--r-- | net/mac80211/tx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 3d57e6d80f6d..1780c24f7957 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -959,8 +959,6 @@ __ieee80211_tx_prepare(struct ieee80211_txrx_data *tx, | |||
959 | tx->dev = dev; /* use original interface */ | 959 | tx->dev = dev; /* use original interface */ |
960 | tx->local = local; | 960 | tx->local = local; |
961 | tx->sdata = IEEE80211_DEV_TO_SUB_IF(dev); | 961 | tx->sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
962 | tx->sta = sta_info_get(local, hdr->addr1); | ||
963 | tx->fc = le16_to_cpu(hdr->frame_control); | ||
964 | 962 | ||
965 | /* | 963 | /* |
966 | * set defaults for things that can be set by | 964 | * set defaults for things that can be set by |
@@ -985,6 +983,8 @@ __ieee80211_tx_prepare(struct ieee80211_txrx_data *tx, | |||
985 | res = TXRX_QUEUED; /* indication it was monitor packet */ | 983 | res = TXRX_QUEUED; /* indication it was monitor packet */ |
986 | } | 984 | } |
987 | 985 | ||
986 | tx->sta = sta_info_get(local, hdr->addr1); | ||
987 | tx->fc = le16_to_cpu(hdr->frame_control); | ||
988 | tx->u.tx.control = control; | 988 | tx->u.tx.control = control; |
989 | if (is_multicast_ether_addr(hdr->addr1)) { | 989 | if (is_multicast_ether_addr(hdr->addr1)) { |
990 | tx->flags &= ~IEEE80211_TXRXD_TXUNICAST; | 990 | tx->flags &= ~IEEE80211_TXRXD_TXUNICAST; |