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 Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
appletalk
/
ddp.c
diff --git
a/net/appletalk/ddp.c
b/net/appletalk/ddp.c
index
7b1eb9a
..
96dc6bb
100644
(file)
--- a/
net/appletalk/ddp.c
+++ b/
net/appletalk/ddp.c
@@
-51,7
+51,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/capability.h>
#include <linux/module.h>
#include <linux/if_arp.h>
#include <linux/capability.h>
#include <linux/module.h>
#include <linux/if_arp.h>
@@
-228,12
+227,11
@@
static void atif_drop_device(struct net_device *dev)
static struct atalk_iface *atif_add_device(struct net_device *dev,
struct atalk_addr *sa)
{
static struct atalk_iface *atif_add_device(struct net_device *dev,
struct atalk_addr *sa)
{
- struct atalk_iface *iface = k
m
alloc(sizeof(*iface), GFP_KERNEL);
+ struct atalk_iface *iface = k
z
alloc(sizeof(*iface), GFP_KERNEL);
if (!iface)
goto out;
if (!iface)
goto out;
- memset(iface, 0, sizeof(*iface));
dev_hold(dev);
iface->dev = dev;
dev->atalk_ptr = iface;
dev_hold(dev);
iface->dev = dev;
dev->atalk_ptr = iface;
@@
-560,12
+558,11
@@
static int atrtr_create(struct rtentry *r, struct net_device *devhint)
}
if (!rt) {
}
if (!rt) {
- rt = k
m
alloc(sizeof(*rt), GFP_ATOMIC);
+ rt = k
z
alloc(sizeof(*rt), GFP_ATOMIC);
retval = -ENOBUFS;
if (!rt)
goto out_unlock;
retval = -ENOBUFS;
if (!rt)
goto out_unlock;
- memset(rt, 0, sizeof(*rt));
rt->next = atalk_routes;
atalk_routes = rt;
rt->next = atalk_routes;
atalk_routes = rt;