diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 18:43:39 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 18:43:39 -0500 |
| commit | 43ecb9a33ba8c93ebbda81d48ca05f0d1bbf9056 (patch) | |
| tree | 28e4c9fa3ac800e2799d48e981a25f1403c4502e /drivers/net/via-velocity.c | |
| parent | 58cba4650a7a414eabd2b40cc9d8e45fcdf192d9 (diff) | |
| parent | 9f3f46b5fe83a56d380d4006dd2cd906bc186f91 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/via-velocity.c')
| -rw-r--r-- | drivers/net/via-velocity.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index 82c6b757d306..c2d5907dc8e0 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c | |||
| @@ -791,7 +791,7 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi | |||
| 791 | #endif | 791 | #endif |
| 792 | 792 | ||
| 793 | if (vptr->flags & VELOCITY_FLAGS_TX_CSUM) { | 793 | if (vptr->flags & VELOCITY_FLAGS_TX_CSUM) { |
| 794 | dev->features |= NETIF_F_HW_CSUM; | 794 | dev->features |= NETIF_F_IP_CSUM; |
| 795 | } | 795 | } |
| 796 | 796 | ||
| 797 | ret = register_netdev(dev); | 797 | ret = register_netdev(dev); |