bridge: sparse fixes in br_ip6_multicast_alloc_query()

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>

diff --git a/include/uapi/linux/igmp.h b/include/uapi/linux/igmp.h
index ccbb32aa67044f949080551c9f4049189f944fa9..a97f9a7568cfe54ca3bfea53957cf2e80f8a1a24 100644 (file)
--- a/include/uapi/linux/igmp.h
+++ b/include/uapi/linux/igmp.h
@@ -53,7 +53,7 @@ struct igmpv3_grec {
 struct igmpv3_report {
        __u8 type;
        __u8 resv1;
-       __be16 csum;
+       __sum16 csum;
        __be16 resv2;
        __be16 ngrec;
        struct igmpv3_grec grec[0];
@@ -62,7 +62,7 @@ struct igmpv3_report {
 struct igmpv3_query {
        __u8 type;
        __u8 code;
-       __be16 csum;
+       __sum16 csum;
        __be32 group;
 #if defined(__LITTLE_ENDIAN_BITFIELD)
        __u8 qrv:3,

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index b30e77e8427c54bffc6801e2f1139139807c439f..f66346122dc42a8adb1fe23e70fa537e8b8bc7aa 100644 (file)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -540,7 +540,7 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br,
                break;
        case 2:
                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_code = 0;
                mld2q->mld2q_cksum = 0;