diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /net/netlink/af_netlink.c | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'net/netlink/af_netlink.c')
| -rw-r--r-- | net/netlink/af_netlink.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 8b8e5a4b8..c57d793c0 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -147,7 +147,7 @@ static int netlink_create(struct socket *sock, int protocol) sock->ops = &netlink_ops; - sk = sk_alloc(AF_NETLINK, GFP_KERNEL, 1); + sk = sk_alloc(PF_NETLINK, GFP_KERNEL, 1); if (!sk) return -ENOMEM; @@ -720,7 +720,7 @@ void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err) if (err == 0) size = NLMSG_SPACE(sizeof(struct nlmsgerr)); else - size = NLMSG_SPACE(4 + nlh->nlmsg_len); + size = NLMSG_SPACE(4 + NLMSG_ALIGN(nlh->nlmsg_len)); skb = alloc_skb(size, GFP_KERNEL); if (!skb) @@ -980,28 +980,28 @@ done: #endif struct proto_ops netlink_ops = { - AF_NETLINK, + PF_NETLINK, sock_no_dup, netlink_release, netlink_bind, netlink_connect, - NULL, - NULL, + sock_no_socketpair, + sock_no_accept, netlink_getname, datagram_poll, sock_no_ioctl, sock_no_listen, sock_no_shutdown, - NULL, - NULL, + sock_no_setsockopt, + sock_no_getsockopt, sock_no_fcntl, netlink_sendmsg, netlink_recvmsg }; struct net_proto_family netlink_family_ops = { - AF_NETLINK, + PF_NETLINK, netlink_create }; |