summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-02-20 10:22:38 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-02-20 10:22:38 -0500
commitb70c21366b469ade12cfd4fedaff411d63c6784f (patch)
treecafc6884d797cae8ef52361fcc4d1289a2b127ba
parentdb8a1d49cf43e08065ec57ef8d754dfd14ca3999 (diff)
[PATCH] strip.c build fix
Someone added a new dev_set_mac_address() to netdevice.h Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r--drivers/net/wireless/strip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index 0acb45971d57..5d351973174f 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -2398,7 +2398,7 @@ static int set_mac_address(struct strip *strip_info,
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;
@@ -2552,7 +2552,7 @@ static void strip_dev_setup(struct net_device *dev)
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;
}