git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
isdn
/
hysdn
/
hysdn_net.c
diff --git
a/drivers/isdn/hysdn/hysdn_net.c
b/drivers/isdn/hysdn/hysdn_net.c
index
aa01628
..
557d96c
100644
(file)
--- a/
drivers/isdn/hysdn/hysdn_net.c
+++ b/
drivers/isdn/hysdn/hysdn_net.c
@@
-24,7
+24,7
@@
#include "hysdn_defs.h"
unsigned int hynet_enable = 0xffffffff;
#include "hysdn_defs.h"
unsigned int hynet_enable = 0xffffffff;
-
MODULE_PARM(hynet_enable, "i"
);
+
module_param(hynet_enable, uint, 0
);
/* store the actual version for log reporting */
char *hysdn_net_revision = "$Revision: 1.8.6.4 $";
/* store the actual version for log reporting */
char *hysdn_net_revision = "$Revision: 1.8.6.4 $";
@@
-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]) {
/* Fill in the MAC-level header (if not already set) */
if (!card->mac_addr[0]) {
- for (i = 0; i < ETH_ALEN - sizeof(ulong); i++)
+ for (i = 0; i < ETH_ALEN - sizeof(u
nsigned
long); i++)
dev->dev_addr[i] = 0xfc;
if ((in_dev = dev->ip_ptr) != NULL) {
struct in_ifaddr *ifa = in_dev->ifa_list;
if (ifa != NULL)
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(u
long)), &ifa->ifa_local, sizeof(u
long));
+ memcpy(dev->dev_addr + (ETH_ALEN - sizeof(u
nsigned long)), &ifa->ifa_local, sizeof(unsigned
long));
}
} else
memcpy(dev->dev_addr, card->mac_addr, ETH_ALEN);
}
} else
memcpy(dev->dev_addr, card->mac_addr, ETH_ALEN);
@@
-197,7
+197,7
@@
hysdn_tx_netack(hysdn_card * card)
/* we got a packet from the network, go and queue it */
/*****************************************************/
void
/* we got a packet from the network, go and queue it */
/*****************************************************/
void
-hysdn_rx_netpkt(hysdn_card * card, u
char * buf, word
len)
+hysdn_rx_netpkt(hysdn_card * card, u
nsigned char *buf, unsigned short
len)
{
struct net_local *lp = card->netif;
struct sk_buff *skb;
{
struct net_local *lp = card->netif;
struct sk_buff *skb;
@@
-278,11
+278,10
@@
hysdn_net_create(hysdn_card * card)
return (-ENOMEM);
}
hysdn_net_release(card); /* release an existing net device */
return (-ENOMEM);
}
hysdn_net_release(card); /* release an existing net device */
- if ((dev = k
m
alloc(sizeof(struct net_local), GFP_KERNEL)) == NULL) {
+ if ((dev = k
z
alloc(sizeof(struct net_local), GFP_KERNEL)) == NULL) {
printk(KERN_WARNING "HYSDN: unable to allocate mem\n");
return (-ENOMEM);
}
printk(KERN_WARNING "HYSDN: unable to allocate mem\n");
return (-ENOMEM);
}
- memset(dev, 0, sizeof(struct net_local)); /* clean the structure */
spin_lock_init(&((struct net_local *) dev)->lock);
spin_lock_init(&((struct net_local *) dev)->lock);