diff options
author | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
commit | c2a7dcad9f0d92d7a96e735abb8bec7b9c621536 (patch) | |
tree | bf9b20fdd5ab07e5b0e4e0b95c6a3dbab1005cb9 /arch/um/drivers/net_kern.c | |
parent | 373a6da165ac3012a74fd072da340eabca55d031 (diff) | |
parent | ea67db4cdbbf7f4e74150e71da0984e25121f500 (diff) |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/um/drivers/net_kern.c')
-rw-r--r-- | arch/um/drivers/net_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c index 73681f14f9..3c6c44ca1f 100644 --- a/arch/um/drivers/net_kern.c +++ b/arch/um/drivers/net_kern.c | |||
@@ -98,10 +98,10 @@ static int uml_net_rx(struct net_device *dev) | |||
98 | if (pkt_len > 0) { | 98 | if (pkt_len > 0) { |
99 | skb_trim(skb, pkt_len); | 99 | skb_trim(skb, pkt_len); |
100 | skb->protocol = (*lp->protocol)(skb); | 100 | skb->protocol = (*lp->protocol)(skb); |
101 | netif_rx(skb); | ||
102 | 101 | ||
103 | lp->stats.rx_bytes += skb->len; | 102 | lp->stats.rx_bytes += skb->len; |
104 | lp->stats.rx_packets++; | 103 | lp->stats.rx_packets++; |
104 | netif_rx(skb); | ||
105 | return pkt_len; | 105 | return pkt_len; |
106 | } | 106 | } |
107 | 107 | ||