Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 111817
b: refs/heads/master
c: 5406951
h: refs/heads/master
i:
  111815: 9f46d6a
v: v3
  • Loading branch information
Krzysztof Halasa authored and Jeff Garzik committed Sep 24, 2008
1 parent 64f6339 commit 088c389
Show file tree
Hide file tree
Showing 2 changed files with 6 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: 2d1ea19da0e84117d3ebbad981e4664bef03152e
refs/heads/master: 54069511633ca9d5b4e5d45cf32ffea06697c88b
8 changes: 5 additions & 3 deletions trunk/drivers/net/wan/hdlc_x25.c
Original file line number Diff line number Diff line change
Expand Up @@ -163,15 +163,17 @@ static void x25_close(struct net_device *dev)

static int x25_rx(struct sk_buff *skb)
{
struct net_device *dev = skb->dev;

if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
skb->dev->stats.rx_dropped++;
dev->stats.rx_dropped++;
return NET_RX_DROP;
}

if (lapb_data_received(skb->dev, skb) == LAPB_OK)
if (lapb_data_received(dev, skb) == LAPB_OK)
return NET_RX_SUCCESS;

skb->dev->stats.rx_errors++;
dev->stats.rx_errors++;
dev_kfree_skb_any(skb);
return NET_RX_DROP;
}
Expand Down

0 comments on commit 088c389

Please sign in to comment.