diff options
Diffstat (limited to 'drivers/isdn/hysdn/hysdn_net.c')
-rw-r--r-- | drivers/isdn/hysdn/hysdn_net.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/hysdn/hysdn_net.c b/drivers/isdn/hysdn/hysdn_net.c index aa01628d74c6..683647b1f2bc 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) | |||
83 | 83 | ||
84 | /* Fill in the MAC-level header (if not already set) */ | 84 | /* Fill in the MAC-level header (if not already set) */ |
85 | if (!card->mac_addr[0]) { | 85 | if (!card->mac_addr[0]) { |
86 | for (i = 0; i < ETH_ALEN - sizeof(ulong); i++) | 86 | for (i = 0; i < ETH_ALEN - sizeof(unsigned long); i++) |
87 | dev->dev_addr[i] = 0xfc; | 87 | dev->dev_addr[i] = 0xfc; |
88 | if ((in_dev = dev->ip_ptr) != NULL) { | 88 | if ((in_dev = dev->ip_ptr) != NULL) { |
89 | struct in_ifaddr *ifa = in_dev->ifa_list; | 89 | struct in_ifaddr *ifa = in_dev->ifa_list; |
90 | if (ifa != NULL) | 90 | if (ifa != NULL) |
91 | memcpy(dev->dev_addr + (ETH_ALEN - sizeof(ulong)), &ifa->ifa_local, sizeof(ulong)); | 91 | memcpy(dev->dev_addr + (ETH_ALEN - sizeof(unsigned long)), &ifa->ifa_local, sizeof(unsigned long)); |
92 | } | 92 | } |
93 | } else | 93 | } else |
94 | memcpy(dev->dev_addr, card->mac_addr, ETH_ALEN); | 94 | memcpy(dev->dev_addr, card->mac_addr, ETH_ALEN); |
@@ -197,7 +197,7 @@ hysdn_tx_netack(hysdn_card * card) | |||
197 | /* we got a packet from the network, go and queue it */ | 197 | /* we got a packet from the network, go and queue it */ |
198 | /*****************************************************/ | 198 | /*****************************************************/ |
199 | void | 199 | void |
200 | hysdn_rx_netpkt(hysdn_card * card, uchar * buf, word len) | 200 | hysdn_rx_netpkt(hysdn_card * card, unsigned char *buf, unsigned short len) |
201 | { | 201 | { |
202 | struct net_local *lp = card->netif; | 202 | struct net_local *lp = card->netif; |
203 | struct sk_buff *skb; | 203 | struct sk_buff *skb; |