diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-25 12:40:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-25 12:40:08 -0400 |
| commit | c6a756795d5ba0637aae8da89dd11bb7e3a1ee74 (patch) | |
| tree | 1c19f951f2604dbb6b867a6dcdf94d20c204cc5c /drivers/net/wireless/orinoco.c | |
| parent | 382066da251132f768380f4852ed5afb72d88f80 (diff) | |
| parent | a8bd60705aa17a998516837d9c1e503ad4cbd7fc (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/wireless/orinoco.c')
| -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 06523e2a8471..c2d0b09e0418 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c | |||
| @@ -812,7 +812,6 @@ static void orinoco_rx_monitor(struct net_device *dev, u16 rxfid, | |||
| 812 | if (datalen > IEEE80211_DATA_LEN + 12) { | 812 | if (datalen > IEEE80211_DATA_LEN + 12) { |
| 813 | printk(KERN_DEBUG "%s: oversized monitor frame, " | 813 | printk(KERN_DEBUG "%s: oversized monitor frame, " |
| 814 | "data length = %d\n", dev->name, datalen); | 814 | "data length = %d\n", dev->name, datalen); |
| 815 | err = -EIO; | ||
| 816 | stats->rx_length_errors++; | 815 | stats->rx_length_errors++; |
| 817 | goto update_stats; | 816 | goto update_stats; |
| 818 | } | 817 | } |
| @@ -821,8 +820,7 @@ static void orinoco_rx_monitor(struct net_device *dev, u16 rxfid, | |||
| 821 | if (!skb) { | 820 | if (!skb) { |
| 822 | printk(KERN_WARNING "%s: Cannot allocate skb for monitor frame\n", | 821 | printk(KERN_WARNING "%s: Cannot allocate skb for monitor frame\n", |
| 823 | dev->name); | 822 | dev->name); |
| 824 | err = -ENOMEM; | 823 | goto update_stats; |
| 825 | goto drop; | ||
| 826 | } | 824 | } |
| 827 | 825 | ||
| 828 | /* Copy the 802.11 header to the skb */ | 826 | /* Copy the 802.11 header to the skb */ |