diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2008-12-12 10:27:08 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-12-18 09:13:37 -0800 |
| commit | d79c98afbdd27d20777d9b7558240db66d69ca37 (patch) | |
| tree | db788dd9b0dd042c86b33886bf7daa76c6e54947 | |
| parent | d3bbe24b08edbfb28f68dea0187933b6908d4d85 (diff) | |
net: eliminate warning from NETIF_F_UFO on bridge
Based on commit b63365a2d60268a3988285d6c3c6003d7066f93a upstream, but
drastically cut down for 2.6.27.y
The bridge device always causes a warning because when it is first created
it has the no checksum flag set along with all the segmentation/fragmentation
offload bits. The code in register_netdevice incorrectly checks for only
hardware checksum bit and ignores no checksum bit.
Similar code is already in 2.6.28:
commit b63365a2d60268a3988285d6c3c6003d7066f93a
net: Fix disjunct computation of netdev features
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Cc: David Miller <davem@davemloft.net>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 0ae08d3f57e7..5a2589667c99 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3990,7 +3990,7 @@ int register_netdevice(struct net_device *dev) dev->features &= ~NETIF_F_TSO; } if (dev->features & NETIF_F_UFO) { - if (!(dev->features & NETIF_F_HW_CSUM)) { + if (!(dev->features & NETIF_F_GEN_CSUM)) { printk(KERN_ERR "%s: Dropping NETIF_F_UFO since no " "NETIF_F_HW_CSUM feature.\n", dev->name); |