aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/core/flow.c1
-rw-r--r--net/core/sock.c1
-rw-r--r--net/dccp/proto.c1
-rw-r--r--net/ipv4/ipcomp.c1
-rw-r--r--net/ipv4/netfilter/Kconfig1
-rw-r--r--net/ipv6/ipcomp6.c1
-rw-r--r--net/netfilter/nf_conntrack_sip.c3
-rw-r--r--net/rose/af_rose.c6
-rw-r--r--net/sunrpc/svc.c16
-rw-r--r--net/unix/af_unix.c4
10 files changed, 22 insertions, 13 deletions
diff --git a/net/core/flow.c b/net/core/flow.c
index a77531c139b7..19991175fdeb 100644
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -23,7 +23,6 @@
23#include <linux/mutex.h> 23#include <linux/mutex.h>
24#include <net/flow.h> 24#include <net/flow.h>
25#include <asm/atomic.h> 25#include <asm/atomic.h>
26#include <asm/semaphore.h>
27#include <linux/security.h> 26#include <linux/security.h>
28 27
29struct flow_cache_entry { 28struct flow_cache_entry {
diff --git a/net/core/sock.c b/net/core/sock.c
index bf6f83e48e87..5dbb81bc9673 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -933,7 +933,6 @@ static void sk_prot_free(struct proto *prot, struct sock *sk)
933 * @family: protocol family 933 * @family: protocol family
934 * @priority: for allocation (%GFP_KERNEL, %GFP_ATOMIC, etc) 934 * @priority: for allocation (%GFP_KERNEL, %GFP_ATOMIC, etc)
935 * @prot: struct proto associated with this new sock instance 935 * @prot: struct proto associated with this new sock instance
936 * @zero_it: if we should zero the newly allocated sock
937 */ 936 */
938struct sock *sk_alloc(struct net *net, int family, gfp_t priority, 937struct sock *sk_alloc(struct net *net, int family, gfp_t priority,
939 struct proto *prot) 938 struct proto *prot)
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index a4c1b36f4bc7..9dfe2470962c 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -27,7 +27,6 @@
27#include <net/xfrm.h> 27#include <net/xfrm.h>
28 28
29#include <asm/ioctls.h> 29#include <asm/ioctls.h>
30#include <asm/semaphore.h>
31#include <linux/spinlock.h> 30#include <linux/spinlock.h>
32#include <linux/timer.h> 31#include <linux/timer.h>
33#include <linux/delay.h> 32#include <linux/delay.h>
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c
index fb53ddfea5b5..a75807b971b3 100644
--- a/net/ipv4/ipcomp.c
+++ b/net/ipv4/ipcomp.c
@@ -14,7 +14,6 @@
14 * - Adaptive compression. 14 * - Adaptive compression.
15 */ 15 */
16#include <linux/module.h> 16#include <linux/module.h>
17#include <asm/semaphore.h>
18#include <linux/crypto.h> 17#include <linux/crypto.h>
19#include <linux/err.h> 18#include <linux/err.h>
20#include <linux/pfkeyv2.h> 19#include <linux/pfkeyv2.h>
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index 0c95cd5872f3..2767841a8cef 100644
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -259,6 +259,7 @@ config NF_NAT_PROTO_SCTP
259 tristate 259 tristate
260 default NF_NAT && NF_CT_PROTO_SCTP 260 default NF_NAT && NF_CT_PROTO_SCTP
261 depends on NF_NAT && NF_CT_PROTO_SCTP 261 depends on NF_NAT && NF_CT_PROTO_SCTP
262 select LIBCRC32C
262 263
263config NF_NAT_FTP 264config NF_NAT_FTP
264 tristate 265 tristate
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index e3dcfa2f436b..ee6de425ce6b 100644
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -34,7 +34,6 @@
34#include <net/ip.h> 34#include <net/ip.h>
35#include <net/xfrm.h> 35#include <net/xfrm.h>
36#include <net/ipcomp.h> 36#include <net/ipcomp.h>
37#include <asm/semaphore.h>
38#include <linux/crypto.h> 37#include <linux/crypto.h>
39#include <linux/err.h> 38#include <linux/err.h>
40#include <linux/pfkeyv2.h> 39#include <linux/pfkeyv2.h>
diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c
index 65b3ba57a3b7..9f4900069561 100644
--- a/net/netfilter/nf_conntrack_sip.c
+++ b/net/netfilter/nf_conntrack_sip.c
@@ -781,7 +781,7 @@ static int set_expected_rtp_rtcp(struct sk_buff *skb,
781 nfct_help(exp->master)->helper != nfct_help(ct)->helper || 781 nfct_help(exp->master)->helper != nfct_help(ct)->helper ||
782 exp->class != class) 782 exp->class != class)
783 break; 783 break;
784 784#ifdef CONFIG_NF_NAT_NEEDED
785 if (exp->tuple.src.l3num == AF_INET && !direct_rtp && 785 if (exp->tuple.src.l3num == AF_INET && !direct_rtp &&
786 (exp->saved_ip != exp->tuple.dst.u3.ip || 786 (exp->saved_ip != exp->tuple.dst.u3.ip ||
787 exp->saved_proto.udp.port != exp->tuple.dst.u.udp.port) && 787 exp->saved_proto.udp.port != exp->tuple.dst.u.udp.port) &&
@@ -791,6 +791,7 @@ static int set_expected_rtp_rtcp(struct sk_buff *skb,
791 tuple.dst.u.udp.port = exp->saved_proto.udp.port; 791 tuple.dst.u.udp.port = exp->saved_proto.udp.port;
792 direct_rtp = 1; 792 direct_rtp = 1;
793 } else 793 } else
794#endif
794 skip_expect = 1; 795 skip_expect = 1;
795 } while (!skip_expect); 796 } while (!skip_expect);
796 rcu_read_unlock(); 797 rcu_read_unlock();
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index d1ff3f885c5d..1ebf65294405 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -760,8 +760,10 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le
760 760
761 rose->neighbour = rose_get_neigh(&addr->srose_addr, &cause, 761 rose->neighbour = rose_get_neigh(&addr->srose_addr, &cause,
762 &diagnostic); 762 &diagnostic);
763 if (!rose->neighbour) 763 if (!rose->neighbour) {
764 return -ENETUNREACH; 764 err = -ENETUNREACH;
765 goto out_release;
766 }
765 767
766 rose->lci = rose_new_lci(rose->neighbour); 768 rose->lci = rose_new_lci(rose->neighbour);
767 if (!rose->lci) { 769 if (!rose->lci) {
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index a290e1523297..090af78d68b5 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -301,7 +301,6 @@ static inline int
301svc_pool_map_set_cpumask(unsigned int pidx, cpumask_t *oldmask) 301svc_pool_map_set_cpumask(unsigned int pidx, cpumask_t *oldmask)
302{ 302{
303 struct svc_pool_map *m = &svc_pool_map; 303 struct svc_pool_map *m = &svc_pool_map;
304 unsigned int node; /* or cpu */
305 304
306 /* 305 /*
307 * The caller checks for sv_nrpools > 1, which 306 * The caller checks for sv_nrpools > 1, which
@@ -314,16 +313,23 @@ svc_pool_map_set_cpumask(unsigned int pidx, cpumask_t *oldmask)
314 default: 313 default:
315 return 0; 314 return 0;
316 case SVC_POOL_PERCPU: 315 case SVC_POOL_PERCPU:
317 node = m->pool_to[pidx]; 316 {
317 unsigned int cpu = m->pool_to[pidx];
318
318 *oldmask = current->cpus_allowed; 319 *oldmask = current->cpus_allowed;
319 set_cpus_allowed(current, cpumask_of_cpu(node)); 320 set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu));
320 return 1; 321 return 1;
322 }
321 case SVC_POOL_PERNODE: 323 case SVC_POOL_PERNODE:
322 node = m->pool_to[pidx]; 324 {
325 unsigned int node = m->pool_to[pidx];
326 node_to_cpumask_ptr(nodecpumask, node);
327
323 *oldmask = current->cpus_allowed; 328 *oldmask = current->cpus_allowed;
324 set_cpus_allowed(current, node_to_cpumask(node)); 329 set_cpus_allowed_ptr(current, nodecpumask);
325 return 1; 330 return 1;
326 } 331 }
332 }
327} 333}
328 334
329/* 335/*
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 2851d0d15048..1454afcc06c4 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -819,7 +819,11 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
819 */ 819 */
820 mode = S_IFSOCK | 820 mode = S_IFSOCK |
821 (SOCK_INODE(sock)->i_mode & ~current->fs->umask); 821 (SOCK_INODE(sock)->i_mode & ~current->fs->umask);
822 err = mnt_want_write(nd.path.mnt);
823 if (err)
824 goto out_mknod_dput;
822 err = vfs_mknod(nd.path.dentry->d_inode, dentry, mode, 0); 825 err = vfs_mknod(nd.path.dentry->d_inode, dentry, mode, 0);
826 mnt_drop_write(nd.path.mnt);
823 if (err) 827 if (err)
824 goto out_mknod_dput; 828 goto out_mknod_dput;
825 mutex_unlock(&nd.path.dentry->d_inode->i_mutex); 829 mutex_unlock(&nd.path.dentry->d_inode->i_mutex);