[patch 2.6.11-rc4-netdev1 1/2] strip: clash with include/linux/netdevice.h
From: Francois Romieu <romieu@fr.zoreil.com>
Date: 2005-02-13 23:30:59
Clash with include/linux/netdevice.h Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> diff -puN drivers/net/wireless/strip.c~strip-000 drivers/net/wireless/strip.c
--- a/drivers/net/wireless/strip.c~strip-000 2005-02-14 00:11:04.238635826 +0100
+++ b/drivers/net/wireless/strip.c 2005-02-14 00:11:04.242635176 +0100@@ -2398,10 +2398,11 @@ static int set_mac_address(struct strip return 0; } -static int dev_set_mac_address(struct net_device *dev, void *addr) +static int strip_set_mac_address(struct net_device *dev, void *addr) { struct strip *strip_info = (struct strip *) (dev->priv); struct sockaddr *sa = addr; + printk(KERN_INFO "%s: strip_set_dev_mac_address called\n", dev->name); set_mac_address(strip_info, (MetricomAddress *) sa->sa_data); return 0;
@@ -2552,7 +2553,7 @@ static void strip_dev_setup(struct net_d dev->hard_start_xmit = strip_xmit; dev->hard_header = strip_header; dev->rebuild_header = strip_rebuild_header; - dev->set_mac_address = dev_set_mac_address; + dev->set_mac_address = strip_set_mac_address; dev->get_stats = strip_get_stats; dev->change_mtu = strip_change_mtu; }
_