diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
| commit | 596c96ba06e5d56e72451e02f93f4e15e17458df (patch) | |
| tree | 78bc640acacb8faeb621c51296e99dbb0533a147 /net/core/dev.c | |
| parent | ad18b0ea089928367185e13d11424aea91d4b41f (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge branch 'master'
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index a44eeef24edf..8d1541595277 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -2717,6 +2717,20 @@ int register_netdevice(struct net_device *dev) | |||
| 2717 | dev->name); | 2717 | dev->name); |
| 2718 | dev->features &= ~NETIF_F_TSO; | 2718 | dev->features &= ~NETIF_F_TSO; |
| 2719 | } | 2719 | } |
| 2720 | if (dev->features & NETIF_F_UFO) { | ||
| 2721 | if (!(dev->features & NETIF_F_HW_CSUM)) { | ||
| 2722 | printk(KERN_ERR "%s: Dropping NETIF_F_UFO since no " | ||
| 2723 | "NETIF_F_HW_CSUM feature.\n", | ||
| 2724 | dev->name); | ||
| 2725 | dev->features &= ~NETIF_F_UFO; | ||
| 2726 | } | ||
| 2727 | if (!(dev->features & NETIF_F_SG)) { | ||
| 2728 | printk(KERN_ERR "%s: Dropping NETIF_F_UFO since no " | ||
| 2729 | "NETIF_F_SG feature.\n", | ||
| 2730 | dev->name); | ||
| 2731 | dev->features &= ~NETIF_F_UFO; | ||
| 2732 | } | ||
| 2733 | } | ||
| 2720 | 2734 | ||
| 2721 | /* | 2735 | /* |
| 2722 | * nil rebuild_header routine, | 2736 | * nil rebuild_header routine, |