diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-06 02:08:07 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-06 02:08:07 -0400 |
| commit | ea2aca084ba82aaf7c148d04914ceed8758ce08a (patch) | |
| tree | dcb3f4f849cf48deac2dd3bafd5c2cd2f0e7dc79 /drivers/net/wan | |
| parent | f3032be921cd126615ce3bfd7084e3d319f3f892 (diff) | |
| parent | c5a78ac00c400df29645e59938700301efb371d0 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wan/hdlc_fr.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'drivers/net/wan')
| -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 109bab34094d..62e93dac6b13 100644 --- a/drivers/net/wan/hdlc_fr.c +++ b/drivers/net/wan/hdlc_fr.c | |||
| @@ -992,6 +992,7 @@ static int fr_rx(struct sk_buff *skb) | |||
| 992 | dev->stats.rx_bytes += skb->len; | 992 | dev->stats.rx_bytes += skb->len; |
| 993 | if (pvc->state.becn) | 993 | if (pvc->state.becn) |
| 994 | dev->stats.rx_compressed++; | 994 | dev->stats.rx_compressed++; |
| 995 | skb->dev = dev; | ||
| 995 | netif_rx(skb); | 996 | netif_rx(skb); |
| 996 | return NET_RX_SUCCESS; | 997 | return NET_RX_SUCCESS; |
| 997 | } else { | 998 | } else { |