diff options
| author | Uwe Kleine-Koenig <ukl@pengutronix.de> | 2008-12-12 11:18:54 +0100 |
|---|---|---|
| committer | Uwe Kleine-Koenig <ukl@pengutronix.de> | 2008-12-12 11:18:54 +0100 |
| commit | 7971db5a4b4176ad5df590fce07a962c643a2740 (patch) | |
| tree | 6ad8e09c5376c4e4c532c3411b0171ba1011acd9 /drivers/isdn/hysdn/hysdn_net.c | |
| parent | d403700bf8fc903584e830967f5d64075770848c (diff) | |
| parent | c4edfced662fa64deeed89c7d8c9f96d86130c19 (diff) | |
Merge branch 'for-rmk-misc' into for-rmk
Diffstat (limited to 'drivers/isdn/hysdn/hysdn_net.c')
| -rw-r--r-- | drivers/isdn/hysdn/hysdn_net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/hysdn/hysdn_net.c b/drivers/isdn/hysdn/hysdn_net.c index cfa8fa5e44a..3f2a0a20c19 100644 --- a/drivers/isdn/hysdn/hysdn_net.c +++ b/drivers/isdn/hysdn/hysdn_net.c @@ -83,12 +83,12 @@ net_open(struct net_device *dev) /* Fill in the MAC-level header (if not already set) */ if (!card->mac_addr[0]) { - for (i = 0; i < ETH_ALEN - sizeof(unsigned long); i++) + for (i = 0; i < ETH_ALEN; i++) dev->dev_addr[i] = 0xfc; if ((in_dev = dev->ip_ptr) != NULL) { struct in_ifaddr *ifa = in_dev->ifa_list; if (ifa != NULL) - memcpy(dev->dev_addr + (ETH_ALEN - sizeof(unsigned long)), &ifa->ifa_local, sizeof(unsigned long)); + memcpy(dev->dev_addr + (ETH_ALEN - sizeof(ifa->ifa_local)), &ifa->ifa_local, sizeof(ifa->ifa_local)); } } else memcpy(dev->dev_addr, card->mac_addr, ETH_ALEN); |