summaryrefslogtreecommitdiff
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2006-05-22 22:45:29 +0400
committerJohn W. Linville <linville@tuxdriver.com>2006-05-22 22:45:29 +0400
commit01d654d25d23fb73deb7904ce1c0b3a0f5fc2908 (patch)
tree625280bf6eae0141fe91844334168d51d7d89fca /drivers/net/wireless
parent3b38f317e529d8396377dafc7d95a1451a151df5 (diff)
parent82464e63a0653a4d8e5c684fcb41b163e6357c6d (diff)
downloadlinux-01d654d25d23fb73deb7904ce1c0b3a0f5fc2908.tar.xz
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/orinoco.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index d4c13ff4d8a1..b563decf599e 100644
--- 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 */