From 9927a151af5560f872abc59a140e2696f3ae5c0e Mon Sep 17 00:00:00 2001
From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Date: Thu, 6 Sep 2012 05:53:35 +0000
Subject: [PATCH] --- yaml --- r: 327823 b: refs/heads/master c:
 b4949ab269a20e9af9a0c40729bac56e8f8a43a2 h: refs/heads/master i:   327821:
 a069e6701e7b5235c14e40a1561c240015f16c7d   327819:
 4dea18d6361c5984c7a167b7ef3e51ef0c79476a   327815:
 5479ee850b53b3e9affb49b942c3546ca711f705   327807:
 47d27a5e899e4b4825b7267c70a27d4ad4ce4101 v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv6/route.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 75a27b94b9da..7d3388d8a08d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ab4551f3b391818e29263279031dca1e26417c6
+refs/heads/master: b4949ab269a20e9af9a0c40729bac56e8f8a43a2
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index fa264447a751..339d921cf3b6 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -1471,6 +1471,9 @@ int ip6_route_add(struct fib6_config *cfg)
 		case RTN_PROHIBIT:
 			rt->dst.error = -EACCES;
 			break;
+		case RTN_THROW:
+			rt->dst.error = -EAGAIN;
+			break;
 		default:
 			rt->dst.error = -ENETUNREACH;
 			break;
@@ -2275,7 +2278,8 @@ static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh,
 
 	if (rtm->rtm_type == RTN_UNREACHABLE ||
 	    rtm->rtm_type == RTN_BLACKHOLE ||
-	    rtm->rtm_type == RTN_PROHIBIT)
+	    rtm->rtm_type == RTN_PROHIBIT ||
+	    rtm->rtm_type == RTN_THROW)
 		cfg->fc_flags |= RTF_REJECT;
 
 	if (rtm->rtm_type == RTN_LOCAL)
@@ -2412,6 +2416,9 @@ static int rt6_fill_node(struct net *net,
 		case -EACCES:
 			rtm->rtm_type = RTN_PROHIBIT;
 			break;
+		case -EAGAIN:
+			rtm->rtm_type = RTN_THROW;
+			break;
 		default:
 			rtm->rtm_type = RTN_UNREACHABLE;
 			break;