diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-14 00:29:49 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-14 00:29:49 -0400 |
| commit | 11c2d8174ed3dc4f1971564732689b4a39129702 (patch) | |
| tree | ac00daa548ea8ac24ae7a5c8062312e335ab9858 /drivers/net/wan/hdlc_fr.c | |
| parent | cde274c0c789404df8ece3f9e7d6506caf0127e2 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
Merge commit 'origin/HEAD' into test-merge
Manual fixup of include/asm-powerpc/pgtable-ppc64.h
Diffstat (limited to 'drivers/net/wan/hdlc_fr.c')
| -rw-r--r-- | drivers/net/wan/hdlc_fr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c index 520bb0b1a9a2..6d35155c7145 100644 --- a/drivers/net/wan/hdlc_fr.c +++ b/drivers/net/wan/hdlc_fr.c | |||
| @@ -1008,6 +1008,7 @@ static int fr_rx(struct sk_buff *skb) | |||
| 1008 | stats->rx_bytes += skb->len; | 1008 | stats->rx_bytes += skb->len; |
| 1009 | if (pvc->state.becn) | 1009 | if (pvc->state.becn) |
| 1010 | stats->rx_compressed++; | 1010 | stats->rx_compressed++; |
| 1011 | skb->dev = dev; | ||
| 1011 | netif_rx(skb); | 1012 | netif_rx(skb); |
| 1012 | return NET_RX_SUCCESS; | 1013 | return NET_RX_SUCCESS; |
| 1013 | } else { | 1014 | } else { |