---

yaml --- r: 194059 b: refs/heads/master c: 0c12295 h: refs/heads/master i: 194057: 213e5aa 194055: ca1e1cf v: v3
git-mirror · Apr 13, 2010 · 82fb288 · 82fb288
1 parent ad2af58
commit 82fb288
Show file tree

Hide file tree

Showing 3 changed files with 201 additions and 183 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 862465f2e7e90975e7bf0ecfbb171dd3adedd950
+refs/heads/master: 0c12295a741d3186987f96f518cfbdaf01abb087
diff --git a/trunk/include/net/netns/ipv4.h b/trunk/include/net/netns/ipv4.h
@@ -59,18 +59,7 @@ struct netns_ipv4 {
 	atomic_t rt_genid;
 
 #ifdef CONFIG_IP_MROUTE
-	struct sock		*mroute_sk;
-	struct timer_list	ipmr_expire_timer;
-	struct list_head	mfc_unres_queue;
-	struct list_head	*mfc_cache_array;
-	struct vif_device	*vif_table;
-	int			maxvif;
-	atomic_t		cache_resolve_queue_len;
-	int			mroute_do_assert;
-	int			mroute_do_pim;
-#if defined(CONFIG_IP_PIMSM_V1) || defined(CONFIG_IP_PIMSM_V2)
-	int			mroute_reg_vif_num;
-#endif
+	struct mr_table		*mrt;
 #endif
 };
 #endif