diff options
| author | Linus Lüssing <linus.luessing@c0d3.blue> | 2015-05-05 00:19:35 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-05 01:19:54 +0200 |
| commit | fcba67c94abe83e0e69a65737000ccbb16a4fa03 (patch) | |
| tree | adf97ee64e90a7477b37cb30f396d1cb8bec2060 | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh... (diff) | |
| download | linux-fcba67c94abe83e0e69a65737000ccbb16a4fa03.tar.xz linux-fcba67c94abe83e0e69a65737000ccbb16a4fa03.zip | |
net: fix two sparse warnings introduced by IGMP/MLD parsing exports
> net/core/skbuff.c:4108:13: sparse: incorrect type in assignment (different base types)
> net/ipv6/mcast_snoop.c:63 ipv6_mc_check_exthdrs() warn: unsigned 'offset' is never less than zero.
Introduced by 9afd85c9e4552b276e2f4cfefd622bdeeffbbf26
("net: Export IGMP/MLD message validation code")
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/skbuff.c | 2 | ||||
| -rw-r--r-- | net/ipv6/mcast_snoop.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 1e4278a4dd7e..b9eb90b39ac7 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4093,7 +4093,7 @@ struct sk_buff *skb_checksum_trimmed(struct sk_buff *skb, { struct sk_buff *skb_chk; unsigned int offset = skb_transport_offset(skb); - int ret; + __sum16 ret; skb_chk = skb_checksum_maybe_trim(skb, transport_len); if (!skb_chk) diff --git a/net/ipv6/mcast_snoop.c b/net/ipv6/mcast_snoop.c index 1a2cbc13a7d3..df8afe5ab31e 100644 --- a/net/ipv6/mcast_snoop.c +++ b/net/ipv6/mcast_snoop.c @@ -47,7 +47,7 @@ static int ipv6_mc_check_ip6hdr(struct sk_buff *skb) static int ipv6_mc_check_exthdrs(struct sk_buff *skb) { const struct ipv6hdr *ip6h; - unsigned int offset; + int offset; u8 nexthdr; __be16 frag_off; |