Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 26928
b: refs/heads/master
c: bb6e093
h: refs/heads/master
v: v3
  • Loading branch information
Florin Malita authored and Linus Torvalds committed May 23, 2006
1 parent 9504390 commit 3de6ecc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 30d6b2f3749e41ce37170ebc445948222b2db4ee
refs/heads/master: bb6e093da23ace2724fdadd27738027468eb82b3
4 changes: 1 addition & 3 deletions trunk/drivers/net/wireless/orinoco.c
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,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;
}
Expand All @@ -821,8 +820,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 */
Expand Down

0 comments on commit 3de6ecc

Please sign in to comment.