lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into upstream

Browse Source
This commit is contained in:
Jeff Garzik
2006-05-23 17:20:58 -04:00
parent 777e1d4a0f 1faadface9
commit 9528454f9c
133 changed files with 2967 additions and 1015 deletions
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) {
printk(KERN_DEBUG "%s: oversized monitor frame, "
"data length = %d\n", dev->name, datalen);
err = -EIO;
stats->rx_length_errors++;
goto update_stats;
}
@@ -766,8 +765,7 @@ static void orinoco_rx_monitor(struct net_device *dev, u16 rxfid,
if (!skb) {
printk(KERN_WARNING "%s: Cannot allocate skb for monitor frame\n",
dev->name);
err = -ENOMEM;
goto drop;
goto update_stats;
}
/* Copy the 802.11 header to the skb */