From 0992a61cafb0f3def3b6997f7c3670a4474f479b Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 26 Mar 2013 01:01:04 +0100 Subject: Fix tunnel and dummy interfaces * pfinet/linux-src/include/linux/netdevice.h (netdevice): Add `change_flags' field. * pfinet/ethernet.c (ethernet_change_flags): Make function static. (setup_ethernet_device): Set `change_flags' field of `dev' to ethernet_change_flags. * pfinet/linux-src/net/core/dev.c (dev_change_flags): Call `change_flags' field of `dev' if non-nul, instead of calling ethernet_change_flags. * pfinet/pfinet.h (ethernet_change_flags): Remove function prototype. --- pfinet/ethernet.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pfinet/ethernet.c') diff --git a/pfinet/ethernet.c b/pfinet/ethernet.c index 5d080730..768d5282 100644 --- a/pfinet/ethernet.c +++ b/pfinet/ethernet.c @@ -250,7 +250,7 @@ ethernet_xmit (struct sk_buff *skb, struct device *dev) } /* Set device flags (e.g. promiscuous) */ -int +static int ethernet_change_flags (struct device *dev, short flags) { error_t err = 0; @@ -313,6 +313,8 @@ setup_ethernet_device (char *name, struct device **device) ethernet_set_multi. */ dev->flags |= IFF_ALLMULTI; + dev->change_flags = ethernet_change_flags; + dev_init_buffers (dev); ethernet_open (dev); -- cgit v1.2.3