---

yaml --- r: 377435 b: refs/heads/master c: ab4eb35 h: refs/heads/master i: 377433: 24b2f59 377431: d7e70fa v: v3
git-mirror · Jun 25, 2013 · 6ac9ee2 · 6ac9ee2
1 parent 5a0335c
commit 6ac9ee2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3d9dd89b781bdcb14201847608b658442de812b
+refs/heads/master: ab4eb3537e3f20b2a88467e1f708a136df6e0ecb
diff --git a/trunk/net/ipv6/ip6_output.c b/trunk/net/ipv6/ip6_output.c
@@ -381,9 +381,8 @@ int ip6_forward(struct sk_buff *skb)
 	 *	cannot be fragmented, because there is no warranty
 	 *	that different fragments will go along one path. --ANK
 	 */
-	if (opt->ra) {
-		u8 *ptr = skb_network_header(skb) + opt->ra;
-		if (ip6_call_ra_chain(skb, (ptr[2]<<8) + ptr[3]))
+	if (unlikely(opt->flags & IP6SKB_ROUTERALERT)) {
+		if (ip6_call_ra_chain(skb, ntohs(opt->ra)))
 			return 0;
 	}