diff options
| author | Pravin B Shelar <pshelar@nicira.com> | 2013-03-07 09:28:01 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-09 16:08:57 -0500 |
| commit | ec5f061564238892005257c83565a0b58ec79295 (patch) | |
| tree | 1ea3987010c27985a3edb7af66e1d143b2cefc77 /net/ipv6/ip6_offload.c | |
| parent | 3868b7aa76310d1d723d4db05c3526c908fb1e8b (diff) | |
net: Kill link between CSUM and SG features.
Earlier SG was unset if CSUM was not available for given device to
force skb copy to avoid sending inconsistent csum.
Commit c9af6db4c11c (net: Fix possible wrong checksum generation)
added explicit flag to force copy to fix this issue. Therefore
there is no need to link SG and CSUM, following patch kills this
link between there two features.
This patch is also required following patch in series.
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_offload.c')
| -rw-r--r-- | net/ipv6/ip6_offload.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c index 8234c1dcdf7..7a0d25a5479 100644 --- a/net/ipv6/ip6_offload.c +++ b/net/ipv6/ip6_offload.c @@ -92,9 +92,6 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb, u8 *prevhdr; int offset = 0; - if (!(features & NETIF_F_V6_CSUM)) - features &= ~NETIF_F_SG; - if (unlikely(skb_shinfo(skb)->gso_type & ~(SKB_GSO_UDP | SKB_GSO_DODGY | |