patch-1.3.38 linux/net/ipv4/ipmr.c

Next file: linux/net/ipv4/packet.c
Previous file: linux/net/ipv4/ipip.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.37/linux/net/ipv4/ipmr.c linux/net/ipv4/ipmr.c
@@ -48,8 +48,6 @@
 #include <linux/notifier.h>
 #include <net/checksum.h>
 
-#ifdef CONFIG_IP_MROUTE
-
 /*
  *	Multicast router conrol variables
  */
@@ -669,7 +667,7 @@
 	/* The timer will clear any 'pending' stuff */
 }
 
-static int ipmr_device_event(unsigned long event, void *ptr)
+static int ipmr_device_event(struct notifier_block *this, unsigned long event, void *ptr)
 {
 	struct vif_device *v;
 	int ct;
@@ -915,5 +913,3 @@
 		ipmr_mfc_info
 	});
 }
-
-#endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this