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>

diff --git a/net/core/dev.c b/net/core/dev.c
index 0ae08d3f57e79730ac893dbb8a046a6678cd622a..5a2589667c993f82950bd27b4657ae0522870b64 100644 (file)
--- 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);