From patchwork Thu Jun 25 13:19:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 488445 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 040F6140077 for ; Thu, 25 Jun 2015 23:07:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752046AbbFYNHX (ORCPT ); Thu, 25 Jun 2015 09:07:23 -0400 Received: from shards.monkeyblade.net ([149.20.54.216]:47545 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752029AbbFYNHV (ORCPT ); Thu, 25 Jun 2015 09:07:21 -0400 Received: from localhost (unknown [IPv6:2001:738:0:410:6078:1993:794a:b31b]) (Authenticated sender: davem-davemloft) by shards.monkeyblade.net (Postfix) with ESMTPSA id 7212E5839DC; Thu, 25 Jun 2015 06:07:20 -0700 (PDT) Date: Thu, 25 Jun 2015 06:19:15 -0700 (PDT) Message-Id: <20150625.061915.375007657782667105.davem@davemloft.net> To: kda@linux-powerpc.org Cc: netdev@vger.kernel.org, ralf@linux-mips.org, edumazet@google.com Subject: [PATCH 2/2] net: Kill sock->sk_protinfo From: David Miller X-Mailer: Mew version 6.4 on Emacs 23.4 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Thu, 25 Jun 2015 06:07:21 -0700 (PDT) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org No more users, so it can now be removed. Signed-off-by: David S. Miller --- include/net/sock.h | 2 -- net/core/sock.c | 1 - net/sctp/socket.c | 6 ------ 3 files changed, 9 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index 14d539c..05a8c1a 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -277,7 +277,6 @@ struct cg_proto; * @sk_incoming_cpu: record cpu processing incoming packets * @sk_txhash: computed flow hash for use on transmit * @sk_filter: socket filtering instructions - * @sk_protinfo: private area, net family specific, when not using slab * @sk_timer: sock cleanup timer * @sk_stamp: time stamp of last packet received * @sk_tsflags: SO_TIMESTAMPING socket options @@ -416,7 +415,6 @@ struct sock { const struct cred *sk_peer_cred; long sk_rcvtimeo; long sk_sndtimeo; - void *sk_protinfo; struct timer_list sk_timer; ktime_t sk_stamp; u16 sk_tsflags; diff --git a/net/core/sock.c b/net/core/sock.c index 1e1fe9a..e4be66f 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 5f6c4e6..1425ec2 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