diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /drivers/net/skfp | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'drivers/net/skfp')
| -rw-r--r-- | drivers/net/skfp/skfddi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c index b6b112318..1bbd5f068 100644 --- a/drivers/net/skfp/skfddi.c +++ b/drivers/net/skfp/skfddi.c @@ -551,7 +551,7 @@ static struct net_device *insert_device(struct net_device *dev, int len; PRINTK(KERN_INFO "entering insert_device\n"); - len = sizeof(struct net_device) + 8 + sizeof(struct s_smc); + len = sizeof(struct net_device) + sizeof(struct s_smc); new = (struct net_device *) kmalloc(len, GFP_KERNEL); if (new == NULL) { printk("fddi%d: Device not initialised, insufficient memory\n", @@ -559,8 +559,7 @@ static struct net_device *insert_device(struct net_device *dev, return NULL; } else { memset((char *) new, 0, len); - new->name = (char *) (new + 1); - new->priv = (struct s_smc *) (new->name + 8); + new->priv = (struct s_smc *) (new + 1); new->init = init; /* initialisation routine */ if (!loading_module) { new->next = dev->next; |