kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'upstream-fixes' into upstream

Browse source
This commit is contained in:
John W. Linville 2006-05-22 14:45:29 -04:00
commit 01d654d25d
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/wireless/orinoco.c
View file

@ -757,7 +757,6 @@ static void orinoco_rx_monitor(struct net_device *dev, u16 rxfid,
if (datalen > IEEE80211_DATA_LEN + 12) { if (datalen > IEEE80211_DATA_LEN + 12) {
printk(KERN_DEBUG "%s: oversized monitor frame, " printk(KERN_DEBUG "%s: oversized monitor frame, "
"data length = %d\n", dev->name, datalen); "data length = %d\n", dev->name, datalen);
err = -EIO;
stats->rx_length_errors++; stats->rx_length_errors++;
goto update_stats; goto update_stats;
} }
@ -766,8 +765,7 @@ static void orinoco_rx_monitor(struct net_device *dev, u16 rxfid,
if (!skb) { if (!skb) {
printk(KERN_WARNING "%s: Cannot allocate skb for monitor frame\n", printk(KERN_WARNING "%s: Cannot allocate skb for monitor frame\n",
dev->name); dev->name);
err = -ENOMEM; goto update_stats;
goto drop;
} }
/* Copy the 802.11 header to the skb */ /* Copy the 802.11 header to the skb */