diff options
| author | Pravin B Shelar <pshelar@nicira.com> | 2013-03-07 10:28:01 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-09 22:08:57 +0100 |
| commit | ec5f061564238892005257c83565a0b58ec79295 (patch) | |
| tree | 1ea3987010c27985a3edb7af66e1d143b2cefc77 /net/ipv4/af_inet.c | |
| parent | ipv6: report sin6_scope_id if sockopt RECVORIGDSTADDR is set (diff) | |
| download | linux-ec5f061564238892005257c83565a0b58ec79295.tar.xz linux-ec5f061564238892005257c83565a0b58ec79295.zip | |
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/ipv4/af_inet.c')
| -rw-r--r-- | net/ipv4/af_inet.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 68f6a94f7661..dc3f677360a5 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1284,9 +1284,6 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb, int id; unsigned int offset = 0; - if (!(features & NETIF_F_V4_CSUM)) - features &= ~NETIF_F_SG; - if (unlikely(skb_shinfo(skb)->gso_type & ~(SKB_GSO_TCPV4 | SKB_GSO_UDP | |