diff --git a/[refs] b/[refs] index 4beec967ec1b..571fc3de29d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d653ed89144828169282a654ffab26811210fd1 +refs/heads/master: 4715213d9cf40285492fff4092bb1fa8e982f632 diff --git a/trunk/net/bridge/br_multicast.c b/trunk/net/bridge/br_multicast.c index b66581208cb2..2d9a0663b848 100644 --- a/trunk/net/bridge/br_multicast.c +++ b/trunk/net/bridge/br_multicast.c @@ -1160,7 +1160,7 @@ static int br_ip6_multicast_query(struct net_bridge *br, goto out; } mld = (struct mld_msg *) icmp6_hdr(skb); - max_delay = msecs_to_jiffies(htons(mld->mld_maxdelay)); + max_delay = msecs_to_jiffies(ntohs(mld->mld_maxdelay)); if (max_delay) group = &mld->mld_mca; } else if (skb->len >= sizeof(*mld2q)) {