projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for...
[powerpc.git]
/
net
/
ipv4
/
devinet.c
diff --git
a/net/ipv4/devinet.c
b/net/ipv4/devinet.c
index
54419b2
..
a6cc31d
100644
(file)
--- a/
net/ipv4/devinet.c
+++ b/
net/ipv4/devinet.c
@@
-27,7
+27,6
@@
* if no match found.
*/
* if no match found.
*/
-#include <linux/config.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/system.h>
@@
-94,10
+93,9
@@
static void devinet_sysctl_unregister(struct ipv4_devconf *p);
static struct in_ifaddr *inet_alloc_ifa(void)
{
static struct in_ifaddr *inet_alloc_ifa(void)
{
- struct in_ifaddr *ifa = k
m
alloc(sizeof(*ifa), GFP_KERNEL);
+ struct in_ifaddr *ifa = k
z
alloc(sizeof(*ifa), GFP_KERNEL);
if (ifa) {
if (ifa) {
- memset(ifa, 0, sizeof(*ifa));
INIT_RCU_HEAD(&ifa->rcu_head);
}
INIT_RCU_HEAD(&ifa->rcu_head);
}
@@
-141,10
+139,9
@@
struct in_device *inetdev_init(struct net_device *dev)
ASSERT_RTNL();
ASSERT_RTNL();
- in_dev = k
m
alloc(sizeof(*in_dev), GFP_KERNEL);
+ in_dev = k
z
alloc(sizeof(*in_dev), GFP_KERNEL);
if (!in_dev)
goto out;
if (!in_dev)
goto out;
- memset(in_dev, 0, sizeof(*in_dev));
INIT_RCU_HEAD(&in_dev->rcu_head);
memcpy(&in_dev->cnf, &ipv4_devconf_dflt, sizeof(in_dev->cnf));
in_dev->cnf.sysctl = NULL;
INIT_RCU_HEAD(&in_dev->rcu_head);
memcpy(&in_dev->cnf, &ipv4_devconf_dflt, sizeof(in_dev->cnf));
in_dev->cnf.sysctl = NULL;