summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi RongQing <roy.qing.li@gmail.com>2012-07-10 01:56:12 +0200
committerDavid S. Miller <davem@davemloft.net>2012-07-11 10:31:24 +0200
commit4715213d9cf40285492fff4092bb1fa8e982f632 (patch)
treeb5cb03e0833061931d23d24afc2f9961132963e1
parentqlge: fix endian issue (diff)
downloadlinux-4715213d9cf40285492fff4092bb1fa8e982f632.tar.xz
linux-4715213d9cf40285492fff4092bb1fa8e982f632.zip
bridge: fix endian
mld->mld_maxdelay is net endian, so we should use ntohs, not htons CC: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: Li RongQing <roy.qing.li@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/bridge/br_multicast.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index b66581208cb2..2d9a0663b848 100644
--- a/net/bridge/br_multicast.c
+++ b/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)) {