---

yaml --- r: 315118 b: refs/heads/master c: 4715213 h: refs/heads/master v: v3
git-mirror · Jul 11, 2012 · 28d4db0 · 28d4db0
1 parent f6b1d75
commit 28d4db0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)) {