Merge branch 'upstream-fixes' into upstream

mariux64 · May 22, 2006 · 01d654d · 01d654d
2 parents 3b38f31 + 82464e6
commit 01d654d
Showing 1 changed file with 1 addition and 3 deletions.
diff --git 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 */