diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-02-20 13:35:01 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-02-20 13:35:01 -0500 |
| commit | 84094b6acf34b8be93624fbce1adcda0692f55e6 (patch) | |
| tree | 3096c412e781fe43c35c2c5025568426266e11bf /drivers/net/wireless/strip.c | |
| parent | 1a997b0e788bf0310e25d5861e8460dfe6dcdb1c (diff) | |
| parent | 23bf8bba8519a2d1e4103a36860d96053c61efdd (diff) | |
Merge modernduck.com:/usr/src/bk/1394-2.6
into modernduck.com:/usr/src/bk/1394-dev
Diffstat (limited to 'drivers/net/wireless/strip.c')
| -rw-r--r-- | drivers/net/wireless/strip.c | 4 |
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; } |