diff options
Diffstat (limited to 'kernel/net/netrom')
| -rw-r--r-- | kernel/net/netrom/af_netrom.c | 4 | ||||
| -rw-r--r-- | kernel/net/netrom/nr_route.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/kernel/net/netrom/af_netrom.c b/kernel/net/netrom/af_netrom.c index b987fd56c..ed212ffc1 100644 --- a/kernel/net/netrom/af_netrom.c +++ b/kernel/net/netrom/af_netrom.c @@ -433,7 +433,7 @@ static int nr_create(struct net *net, struct socket *sock, int protocol, if (sock->type != SOCK_SEQPACKET || protocol != 0) return -ESOCKTNOSUPPORT; - sk = sk_alloc(net, PF_NETROM, GFP_ATOMIC, &nr_proto); + sk = sk_alloc(net, PF_NETROM, GFP_ATOMIC, &nr_proto, kern); if (sk == NULL) return -ENOMEM; @@ -476,7 +476,7 @@ static struct sock *nr_make_new(struct sock *osk) if (osk->sk_type != SOCK_SEQPACKET) return NULL; - sk = sk_alloc(sock_net(osk), PF_NETROM, GFP_ATOMIC, osk->sk_prot); + sk = sk_alloc(sock_net(osk), PF_NETROM, GFP_ATOMIC, osk->sk_prot, 0); if (sk == NULL) return NULL; diff --git a/kernel/net/netrom/nr_route.c b/kernel/net/netrom/nr_route.c index 96b64d2f6..d72a4f155 100644 --- a/kernel/net/netrom/nr_route.c +++ b/kernel/net/netrom/nr_route.c @@ -31,7 +31,6 @@ #include <linux/mm.h> #include <linux/interrupt.h> #include <linux/notifier.h> -#include <linux/netfilter.h> #include <linux/init.h> #include <linux/spinlock.h> #include <net/netrom.h> |