diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-22 14:45:29 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-22 14:45:29 -0400 |
| commit | 01d654d25d23fb73deb7904ce1c0b3a0f5fc2908 (patch) | |
| tree | 625280bf6eae0141fe91844334168d51d7d89fca | |
| parent | 3b38f317e529d8396377dafc7d95a1451a151df5 (diff) | |
| parent | 82464e63a0653a4d8e5c684fcb41b163e6357c6d (diff) | |
Merge branch 'upstream-fixes' into upstream
| -rw-r--r-- | drivers/net/wireless/orinoco.c | 4 |
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, | |||
| 757 | if (datalen > IEEE80211_DATA_LEN + 12) { | 757 | if (datalen > IEEE80211_DATA_LEN + 12) { |
| 758 | printk(KERN_DEBUG "%s: oversized monitor frame, " | 758 | printk(KERN_DEBUG "%s: oversized monitor frame, " |
| 759 | "data length = %d\n", dev->name, datalen); | 759 | "data length = %d\n", dev->name, datalen); |
| 760 | err = -EIO; | ||
| 761 | stats->rx_length_errors++; | 760 | stats->rx_length_errors++; |
| 762 | goto update_stats; | 761 | goto update_stats; |
| 763 | } | 762 | } |
| @@ -766,8 +765,7 @@ static void orinoco_rx_monitor(struct net_device *dev, u16 rxfid, | |||
| 766 | if (!skb) { | 765 | if (!skb) { |
| 767 | printk(KERN_WARNING "%s: Cannot allocate skb for monitor frame\n", | 766 | printk(KERN_WARNING "%s: Cannot allocate skb for monitor frame\n", |
| 768 | dev->name); | 767 | dev->name); |
| 769 | err = -ENOMEM; | 768 | goto update_stats; |
| 770 | goto drop; | ||
| 771 | } | 769 | } |
| 772 | 770 | ||
| 773 | /* Copy the 802.11 header to the skb */ | 771 | /* Copy the 802.11 header to the skb */ |