Commit f7e603ad authored by Linus Torvalds's avatar Linus Torvalds

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  net: amend the fix for SO_BSDCOMPAT gsopt infoleak
  netns: build fix for net_alloc_generic
parents cac71121 50fee1de
...@@ -63,10 +63,6 @@ static __net_init int setup_net(struct net *net) ...@@ -63,10 +63,6 @@ static __net_init int setup_net(struct net *net)
goto out; goto out;
} }
#ifdef CONFIG_NET_NS
static struct kmem_cache *net_cachep;
static struct workqueue_struct *netns_wq;
static struct net_generic *net_alloc_generic(void) static struct net_generic *net_alloc_generic(void)
{ {
struct net_generic *ng; struct net_generic *ng;
...@@ -80,6 +76,10 @@ static struct net_generic *net_alloc_generic(void) ...@@ -80,6 +76,10 @@ static struct net_generic *net_alloc_generic(void)
return ng; return ng;
} }
#ifdef CONFIG_NET_NS
static struct kmem_cache *net_cachep;
static struct workqueue_struct *netns_wq;
static struct net *net_alloc(void) static struct net *net_alloc(void)
{ {
struct net *net = NULL; struct net *net = NULL;
......
...@@ -696,7 +696,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname, ...@@ -696,7 +696,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
if (len < 0) if (len < 0)
return -EINVAL; return -EINVAL;
v.val = 0; memset(&v, 0, sizeof(v));
switch(optname) { switch(optname) {
case SO_DEBUG: case SO_DEBUG:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment