Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-09 14:50:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bridge: sparse fixes in br_ip6_multicast_alloc_query()

Browse Source 
Changed type of csum field in struct igmpv3_query from __be16 to
__sum16 to eliminate type warning, made same change in struct
igmpv3_report for consistency.

Fixed up an ntohs() where htons() should have been used instead.

Signed-off-by: Lance Richardson <lrichard@redhat.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Lance Richardson 2017-01-16 18:11:35 -05:00 committed by David S. Miller
parent 580bdf5650
commit 53631a5f9c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/uapi/linux/igmp.h
View File

@ -53,7 +53,7 @@ struct igmpv3_grec {
struct igmpv3_report { struct igmpv3_report {
__u8 type; __u8 type;
__u8 resv1; __u8 resv1;
__be16 csum; __sum16 csum;
__be16 resv2; __be16 resv2;
__be16 ngrec; __be16 ngrec;
struct igmpv3_grec grec[0]; struct igmpv3_grec grec[0];
@ -62,7 +62,7 @@ struct igmpv3_report {
struct igmpv3_query { struct igmpv3_query {
__u8 type; __u8 type;
__u8 code; __u8 code;
__be16 csum; __sum16 csum;
__be32 group; __be32 group;
#if defined(__LITTLE_ENDIAN_BITFIELD) #if defined(__LITTLE_ENDIAN_BITFIELD)
__u8 qrv:3, __u8 qrv:3,

2
net/bridge/br_multicast.c
View File

@ -540,7 +540,7 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br,
break; break;
case 2: case 2:
mld2q = (struct mld2_query *)icmp6_hdr(skb); mld2q = (struct mld2_query *)icmp6_hdr(skb);
mld2q->mld2q_mrc = ntohs((u16)jiffies_to_msecs(interval)); mld2q->mld2q_mrc = htons((u16)jiffies_to_msecs(interval));
mld2q->mld2q_type = ICMPV6_MGM_QUERY; mld2q->mld2q_type = ICMPV6_MGM_QUERY;
mld2q->mld2q_code = 0; mld2q->mld2q_code = 0;
mld2q->mld2q_cksum = 0; mld2q->mld2q_cksum = 0;