git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
3b38f31
)
Merge branch 'upstream-fixes' into upstream
author
John W. Linville
<linville@tuxdriver.com>
Mon, 22 May 2006 18:45:29 +0000
(14:45 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Mon, 22 May 2006 18:45:29 +0000
(14:45 -0400)
drivers/net/wireless/orinoco.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/orinoco.c
b/drivers/net/wireless/orinoco.c
index
d4c13ff
..
b563dec
100644
(file)
--- a/
drivers/net/wireless/orinoco.c
+++ b/
drivers/net/wireless/orinoco.c
@@
-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 */