diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 12:01:28 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 12:01:28 -0500 |
| commit | 9db73724453a9350e1c22dbe732d427e2939a5c9 (patch) | |
| tree | 15e3ead6413ae97398a54292acc199bee0864d42 /drivers/net/tokenring/ibmtr.c | |
| parent | 4c1ac1b49122b805adfa4efc620592f68dccf5db (diff) | |
| parent | e62438630ca37539c8cc1553710bbfaa3cf960a7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/ata/libata-scsi.c
include/linux/libata.h
Futher merge of Linus's head and compilation fixups.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'drivers/net/tokenring/ibmtr.c')
| -rw-r--r-- | drivers/net/tokenring/ibmtr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c index bfe59865b1dd..0d97e10ccac5 100644 --- a/drivers/net/tokenring/ibmtr.c +++ b/drivers/net/tokenring/ibmtr.c | |||
| @@ -1826,7 +1826,7 @@ static void tr_rx(struct net_device *dev) | |||
| 1826 | skb->protocol = tr_type_trans(skb, dev); | 1826 | skb->protocol = tr_type_trans(skb, dev); |
| 1827 | if (IPv4_p) { | 1827 | if (IPv4_p) { |
| 1828 | skb->csum = chksum; | 1828 | skb->csum = chksum; |
| 1829 | skb->ip_summed = 1; | 1829 | skb->ip_summed = CHECKSUM_COMPLETE; |
| 1830 | } | 1830 | } |
| 1831 | netif_rx(skb); | 1831 | netif_rx(skb); |
| 1832 | dev->last_rx = jiffies; | 1832 | dev->last_rx = jiffies; |