net: fix can_checksum_protocol() arguments swap

Eric Dumazet · davem330 · commit d402786ea4f8 · 2011-01-19T14:15:21.000-08:00
commit 0363466 (net offloading: Convert checksums to use centrally computed features.) mistakenly swapped can_checksum_protocol() arguments. This broke IPv6 on bnx2 for instance, on NIC without TCPv6 checksum offloads. Reported-by: Hans de Bruin <jmdebruin@xmsnet.nl> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Acked-by: Jesse Gross <jesse@nicira.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/core/dev.c b/net/core/dev.c
@@ -2001,7 +2001,7 @@ static bool can_checksum_protocol(unsigned long features, __be16 protocol)
 
 static int harmonize_features(struct sk_buff *skb, __be16 protocol, int features)
 {
-	if (!can_checksum_protocol(protocol, features)) {
+	if (!can_checksum_protocol(features, protocol)) {
 		features &= ~NETIF_F_ALL_CSUM;
 		features &= ~NETIF_F_SG;
 	} else if (illegal_highdma(skb->dev, skb)) {

Original file line number	Diff line number	Diff line change
`@@ -2001,7 +2001,7 @@ static bool can_checksum_protocol(unsigned long features, __be16 protocol)`
`2001`	`2001`
`2002`	`2002`	`static int harmonize_features(struct sk_buff *skb, __be16 protocol, int features)`
`2003`	`2003`	`{`
`2004`		`- if (!can_checksum_protocol(protocol, features)) {`
	`2004`	`+ if (!can_checksum_protocol(features, protocol)) {`
`2005`	`2005`	`features &= ~NETIF_F_ALL_CSUM;`
`2006`	`2006`	`features &= ~NETIF_F_SG;`
`2007`	`2007`	`} else if (illegal_highdma(skb->dev, skb)) {`