From 6ac9ee22021444504403536a6c69a7deb9994de6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?YOSHIFUJI=20Hideaki=20/=20=E5=90=89=E8=97=A4=E8=8B=B1?=
 =?UTF-8?q?=E6=98=8E?= <yoshfuji@linux-ipv6.org>
Date: Sat, 22 Jun 2013 11:13:13 +0900
Subject: [PATCH] --- yaml --- r: 377435 b: refs/heads/master c:
 ab4eb3537e3f20b2a88467e1f708a136df6e0ecb h: refs/heads/master i:   377433:
 24b2f59dfa4f2107dacfb4803675ba5de3813898   377431:
 d7e70fab6b6e00118e85a9a97c1910b1370aeb88 v: v3

---
 [refs]                      | 2 +-
 trunk/net/ipv6/ip6_output.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 01aa40ed3586..1b598810bd38 100644
--- 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
index dae1949019d7..95703ba2c084 100644
--- 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;
 	}