diff options
Diffstat (limited to 'net/ax25/ax25_dev.c')
| -rw-r--r-- | net/ax25/ax25_dev.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ax25/ax25_dev.c b/net/ax25/ax25_dev.c index dab77efe34a6..b787678220ff 100644 --- a/net/ax25/ax25_dev.c +++ b/net/ax25/ax25_dev.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk) | 7 | * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk) |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/errno.h> | 9 | #include <linux/errno.h> |
| 11 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 12 | #include <linux/socket.h> | 11 | #include <linux/socket.h> |
| @@ -56,15 +55,13 @@ void ax25_dev_device_up(struct net_device *dev) | |||
| 56 | { | 55 | { |
| 57 | ax25_dev *ax25_dev; | 56 | ax25_dev *ax25_dev; |
| 58 | 57 | ||
| 59 | if ((ax25_dev = kmalloc(sizeof(*ax25_dev), GFP_ATOMIC)) == NULL) { | 58 | if ((ax25_dev = kzalloc(sizeof(*ax25_dev), GFP_ATOMIC)) == NULL) { |
| 60 | printk(KERN_ERR "AX.25: ax25_dev_device_up - out of memory\n"); | 59 | printk(KERN_ERR "AX.25: ax25_dev_device_up - out of memory\n"); |
| 61 | return; | 60 | return; |
| 62 | } | 61 | } |
| 63 | 62 | ||
| 64 | ax25_unregister_sysctl(); | 63 | ax25_unregister_sysctl(); |
| 65 | 64 | ||
| 66 | memset(ax25_dev, 0x00, sizeof(*ax25_dev)); | ||
| 67 | |||
| 68 | dev->ax25_ptr = ax25_dev; | 65 | dev->ax25_ptr = ax25_dev; |
| 69 | ax25_dev->dev = dev; | 66 | ax25_dev->dev = dev; |
| 70 | dev_hold(dev); | 67 | dev_hold(dev); |
