patch-2.1.30 linux/include/net/if_inet6.h

Next file: linux/include/net/ip6_fib.h
Previous file: linux/include/net/flow.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.29/linux/include/net/if_inet6.h linux/include/net/if_inet6.h
@@ -59,14 +59,17 @@
 	struct ipv6_mc_socklist *next;
 };
 
-struct ipv6_mc_list {
-	struct in6_addr		addr;
+#define MAF_TIMER_RUNNING	0x01
+#define MAF_LAST_REPORTER	0x02
+
+struct ifmcaddr6 {
+	struct in6_addr		mca_addr;
 	struct device		*dev;
-	struct ipv6_mc_list	*next;
-	struct ipv6_mc_list	*if_next;
-	struct timer_list	timer;
-        int			tm_running;
-        atomic_t		users;	
+	struct ifmcaddr6	*next;
+	struct ifmcaddr6	*if_next;
+	struct timer_list	mca_timer;
+	unsigned long		mca_flags;
+	atomic_t		mca_users;	
 };
 
 #define	IFA_HOST	IPV6_ADDR_LOOPBACK
@@ -81,9 +84,8 @@
 	struct device		*dev;
 
 	struct inet6_ifaddr	*addr_list;
-	struct ipv6_mc_list	*mc_list;
+	struct ifmcaddr6	*mc_list;
 
-	__u32			if_index;
 	__u32			if_flags;
 	__u32			router:1,
 				unused:31;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov