mirror of
https://github.com/torvalds/linux.git
synced 2026-10-24 16:55:02 +02:00
Revert "wifi: libertas: reject short monitor TX frames"
This reverts commit13ff543e0b. The 'goto free' just made things worse, causing a spinlock to be handled incorrectly. Revert this for now. Reported-by: Takashi Iwai <tiwai@suse.de> Cc: stable@vger.kernel.org Fixes:13ff543e0b("wifi: libertas: reject short monitor TX frames") Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
parent
08a3f02fea
commit
9727d1c4e1
|
|
@ -117,13 +117,6 @@ netdev_tx_t lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
if (priv->wdev->iftype == NL80211_IFTYPE_MONITOR) {
|
||||
struct tx_radiotap_hdr *rtap_hdr = (void *)skb->data;
|
||||
|
||||
if (skb->len < sizeof(*rtap_hdr) + 4 + ETH_ALEN) {
|
||||
lbs_deb_tx("tx err: short monitor frame %u\n", skb->len);
|
||||
dev->stats.tx_dropped++;
|
||||
dev->stats.tx_errors++;
|
||||
goto free;
|
||||
}
|
||||
|
||||
/* set txpd fields from the radiotap header */
|
||||
txpd->tx_control = cpu_to_le32(convert_radiotap_rate_to_mv(rtap_hdr->rate));
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user