]> git.baikalelectronics.ru Git - kernel.git/commit
net: fix two sparse errors
authorEric Dumazet <edumazet@google.com>
Fri, 15 May 2015 12:48:07 +0000 (05:48 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 17 May 2015 17:08:29 +0000 (13:08 -0400)
commit8849bf8d9868b6b9d2337f96acc6fe16028e17ba
tree848cc5789a472daa9163e7fe8782c807b28a72c3
parentb402d56f1d46cf3ebf55641f962d254bedca6cdc
net: fix two sparse errors

First one in __skb_checksum_validate_complete() fixes the following
(and other callers)

make C=2 CF=-D__CHECK_ENDIAN__ net/ipv4/tcp_ipv4.o
  CHECK   net/ipv4/tcp_ipv4.c
include/linux/skbuff.h:3052:24: warning: incorrect type in return expression (different base types)
include/linux/skbuff.h:3052:24:    expected restricted __sum16
include/linux/skbuff.h:3052:24:    got int

Second is fixing gso_make_checksum() :

  CHECK   net/ipv4/gre_offload.c
include/linux/skbuff.h:3360:14: warning: incorrect type in assignment (different base types)
include/linux/skbuff.h:3360:14:    expected unsigned short [unsigned] [usertype] csum
include/linux/skbuff.h:3360:14:    got restricted __sum16
include/linux/skbuff.h:3365:16: warning: incorrect type in return expression (different base types)
include/linux/skbuff.h:3365:16:    expected restricted __sum16
include/linux/skbuff.h:3365:16:    got unsigned short [unsigned] [usertype] csum

Fixes: ae323d77b272d ("net: Support for csum_bad in skbuff")
Fixes: 4226b4ba8189f ("net: Support for multiple checksums with gso")
Signed-off-by: Eric Dumazet <edumazet@google.com>
CC: Tom Herbert <tom@herbertland.com>
Acked-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/skbuff.h