[2/2] net: Loosen constraints for recalculating checksum in skb_segment()

Message ID 1366356595-3405-3-git-send-email-horms@verge.net.au
State Superseded, archived
Delegated to: David Miller
Headers show

Commit Message

Simon Horman April 19, 2013, 7:29 a.m.
In the case where a non-MPLS GSO skb becomes an MPLS GSO skb, via
Open vSwitch's push MPLS action it is desirable to provide segmentation
in software. In this case the original protocol of the skb may have allowed
its checksumming to be offloaded but this may no longer be supported now
the skb is MPLS. Actually it seems to me that this is the likely case.

In order to allow the checksum to be updated in this case loosen
the rules for recalculating the checksum on in skb_segment().

N.B.: I must confess that I am a little unsure of the details of
the implementation of skb_checksum(). But I have observed that this
is necessary as skb_checksum() hits the following:

		if (!hsize && i >= nfrags) {
			fskb = fskb->next;
		if (fskb != skb_shinfo(skb)->frag_list)

Signed-off-by: Simon Horman <horms@verge.net.au>
 net/core/skbuff.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 7504371..e3bb024 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2825,7 +2825,7 @@  struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)
 						 doffset + tnl_hlen);
 		if (fskb != skb_shinfo(skb)->frag_list)
-			continue;
+			goto csum;
 		if (!sg) {
 			nskb->ip_summed = CHECKSUM_NONE;
@@ -2889,6 +2889,7 @@  skip_fraglist:
 		nskb->len += nskb->data_len;
 		nskb->truesize += nskb->data_len;
 		if (!csum) {
 			nskb->csum = skb_checksum(nskb, doffset,
 						  nskb->len - doffset, 0);