aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/netns/ipv6.h2
-rw-r--r--net/ipv6/ip6mr.c26
2 files changed, 12 insertions, 16 deletions
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 30572f3f9781..919cb0f20055 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -61,6 +61,8 @@ struct netns_ipv6 {
61 struct mif_device *vif6_table; 61 struct mif_device *vif6_table;
62 int maxvif; 62 int maxvif;
63 atomic_t cache_resolve_queue_len; 63 atomic_t cache_resolve_queue_len;
64 int mroute_do_assert;
65 int mroute_do_pim;
64#endif 66#endif
65}; 67};
66#endif 68#endif
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 077c8198eb53..2d2ac23b8606 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -61,13 +61,6 @@ static DEFINE_RWLOCK(mrt_lock);
61 61
62#define MIF_EXISTS(_net, _idx) ((_net)->ipv6.vif6_table[_idx].dev != NULL) 62#define MIF_EXISTS(_net, _idx) ((_net)->ipv6.vif6_table[_idx].dev != NULL)
63 63
64static int mroute_do_assert; /* Set in PIM assert */
65#ifdef CONFIG_IPV6_PIMSM_V2
66static int mroute_do_pim;
67#else
68#define mroute_do_pim 0
69#endif
70
71static struct mfc6_cache *mfc_unres_queue; /* Queue of unresolved entries */ 64static struct mfc6_cache *mfc_unres_queue; /* Queue of unresolved entries */
72 65
73/* Special spinlock for queue of unresolved entries */ 66/* Special spinlock for queue of unresolved entries */
@@ -1306,7 +1299,7 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, int
1306 int v; 1299 int v;
1307 if (get_user(v, (int __user *)optval)) 1300 if (get_user(v, (int __user *)optval))
1308 return -EFAULT; 1301 return -EFAULT;
1309 mroute_do_assert = !!v; 1302 init_net.ipv6.mroute_do_assert = !!v;
1310 return 0; 1303 return 0;
1311 } 1304 }
1312 1305
@@ -1319,10 +1312,10 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, int
1319 v = !!v; 1312 v = !!v;
1320 rtnl_lock(); 1313 rtnl_lock();
1321 ret = 0; 1314 ret = 0;
1322 if (v != mroute_do_pim) { 1315 if (v != init_net.ipv6.mroute_do_pim) {
1323 mroute_do_pim = v; 1316 init_net.ipv6.mroute_do_pim = v;
1324 mroute_do_assert = v; 1317 init_net.ipv6.mroute_do_assert = v;
1325 if (mroute_do_pim) 1318 if (init_net.ipv6.mroute_do_pim)
1326 ret = inet6_add_protocol(&pim6_protocol, 1319 ret = inet6_add_protocol(&pim6_protocol,
1327 IPPROTO_PIM); 1320 IPPROTO_PIM);
1328 else 1321 else
@@ -1361,11 +1354,11 @@ int ip6_mroute_getsockopt(struct sock *sk, int optname, char __user *optval,
1361 break; 1354 break;
1362#ifdef CONFIG_IPV6_PIMSM_V2 1355#ifdef CONFIG_IPV6_PIMSM_V2
1363 case MRT6_PIM: 1356 case MRT6_PIM:
1364 val = mroute_do_pim; 1357 val = init_net.ipv6.mroute_do_pim;
1365 break; 1358 break;
1366#endif 1359#endif
1367 case MRT6_ASSERT: 1360 case MRT6_ASSERT:
1368 val = mroute_do_assert; 1361 val = init_net.ipv6.mroute_do_assert;
1369 break; 1362 break;
1370 default: 1363 default:
1371 return -ENOPROTOOPT; 1364 return -ENOPROTOOPT;
@@ -1553,13 +1546,14 @@ static int ip6_mr_forward(struct sk_buff *skb, struct mfc6_cache *cache)
1553 cache->mfc_un.res.wrong_if++; 1546 cache->mfc_un.res.wrong_if++;
1554 true_vifi = ip6mr_find_vif(skb->dev); 1547 true_vifi = ip6mr_find_vif(skb->dev);
1555 1548
1556 if (true_vifi >= 0 && mroute_do_assert && 1549 if (true_vifi >= 0 && init_net.ipv6.mroute_do_assert &&
1557 /* pimsm uses asserts, when switching from RPT to SPT, 1550 /* pimsm uses asserts, when switching from RPT to SPT,
1558 so that we cannot check that packet arrived on an oif. 1551 so that we cannot check that packet arrived on an oif.
1559 It is bad, but otherwise we would need to move pretty 1552 It is bad, but otherwise we would need to move pretty
1560 large chunk of pimd to kernel. Ough... --ANK 1553 large chunk of pimd to kernel. Ough... --ANK
1561 */ 1554 */
1562 (mroute_do_pim || cache->mfc_un.res.ttls[true_vifi] < 255) && 1555 (init_net.ipv6.mroute_do_pim ||
1556 cache->mfc_un.res.ttls[true_vifi] < 255) &&
1563 time_after(jiffies, 1557 time_after(jiffies,
1564 cache->mfc_un.res.last_assert + MFC_ASSERT_THRESH)) { 1558 cache->mfc_un.res.last_assert + MFC_ASSERT_THRESH)) {
1565 cache->mfc_un.res.last_assert = jiffies; 1559 cache->mfc_un.res.last_assert = jiffies;