]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
net: Disable all TSO features when SG is disabled
authorBen Hutchings <bhutchings@solarflare.com>
Tue, 12 Apr 2011 14:38:37 +0000 (14:38 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 13 Apr 2011 02:29:45 +0000 (19:29 -0700)
commitea2d36883ca8e6caab23b6d15bfa80b1d1d81d2f
tree38818d7330814e276b5e651ec4540ac2eb41d774
parentc0212fb146bf3e77cd6b28a06b8f503e2974fdc8
net: Disable all TSO features when SG is disabled

The feature flags NETIF_F_TSO and NETIF_F_TSO6 independently enable
TSO for IPv4 and IPv6 respectively.  However, the test in
netdev_fix_features() and its predecessor functions was never updated
to check for NETIF_F_TSO6, possibly because it was originally proposed
that TSO for IPv6 would be dependent on both feature flags.

Now that these feature flags can be changed independently from
user-space and we depend on netdev_fix_features() to fix invalid
feature combinations, it's important to disable them both if
scatter-gather is disabled.  Also disable NETIF_F_TSO_ECN so
user-space sees all TSO features as disabled.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/dev.c