aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSridhar Samudrala <sri@us.ibm.com>2009-10-07 08:24:25 -0400
committerDavid S. Miller <davem@davemloft.net>2009-10-08 01:00:23 -0400
commitd9f5950f90292f7cc42834338dfd5f44dc4cc4ca (patch)
tree5d17e0ae9ff4a817552c02c3ed08a66d7832e24b /net
parentf86dcc5aa8c7908f2c287e7a211228df599e3e71 (diff)
net: Make UFO on master device independent of attached devices
Now that software UFO is supported, UFO can be enabled on master devices like bridge, bond even though the attached device doesn't support this feature in hardware. This allows UFO to be used between KVM host and guest even when a physical interface attached to the bridge doesn't support UFO. Signed-off-by: Sridhar Samudrala <sri@us.ibm.com> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index a74c8fd69556..510ff205d5db 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5489,7 +5489,7 @@ unsigned long netdev_increment_features(unsigned long all, unsigned long one,
5489 one |= NETIF_F_ALL_CSUM; 5489 one |= NETIF_F_ALL_CSUM;
5490 5490
5491 one |= all & NETIF_F_ONE_FOR_ALL; 5491 one |= all & NETIF_F_ONE_FOR_ALL;
5492 all &= one | NETIF_F_LLTX | NETIF_F_GSO; 5492 all &= one | NETIF_F_LLTX | NETIF_F_GSO | NETIF_F_UFO;
5493 all |= one & mask & NETIF_F_ONE_FOR_ALL; 5493 all |= one & mask & NETIF_F_ONE_FOR_ALL;
5494 5494
5495 return all; 5495 return all;