summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2015-06-25 16:19:15 +0300
committerDavid S. Miller <davem@davemloft.net>2015-06-29 02:55:44 +0300
commit1830fcea5bbed2719a9dc32aebe802f72ddf14ab (patch)
tree058de6199ab0f871a51953ab18a9b64e06187d1a /net
parent3200392b88dd25f0d60a500a38d1ce538eb7f933 (diff)
downloadlinux-1830fcea5bbed2719a9dc32aebe802f72ddf14ab.tar.xz
net: Kill sock->sk_protinfo
No more users, so it can now be removed. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/sock.c1
-rw-r--r--net/sctp/socket.c6
2 files changed, 0 insertions, 7 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index 1e1fe9a68d83..e4be66fb3bd5 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2269,7 +2269,6 @@ static void sock_def_write_space(struct sock *sk)
static void sock_def_destruct(struct sock *sk)
{
- kfree(sk->sk_protinfo);
}
void sk_send_sigurg(struct sock *sk)
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 5f6c4e61325b..1425ec2bbd5a 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -2121,12 +2121,6 @@ static int sctp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
if (sp->subscribe.sctp_data_io_event)
sctp_ulpevent_read_sndrcvinfo(event, msg);
-#if 0
- /* FIXME: we should be calling IP/IPv6 layers. */
- if (sk->sk_protinfo.af_inet.cmsg_flags)
- ip_cmsg_recv(msg, skb);
-#endif
-
err = copied;
/* If skb's length exceeds the user's buffer, update the skb and