From patchwork Tue Nov 5 05:26:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Krystad X-Patchwork-Id: 1189317 X-Patchwork-Delegate: matthieu.baerts@tessares.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.01.org (client-ip=198.145.21.10; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.intel.com Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 476dSz6pRDz9sP6 for ; Tue, 5 Nov 2019 16:26:58 +1100 (AEDT) Received: from new-ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 726FE100DC41A; Mon, 4 Nov 2019 21:29:40 -0800 (PST) Received-SPF: None (mailfrom) identity=mailfrom; client-ip=192.55.52.43; helo=mga05.intel.com; envelope-from=peter.krystad@linux.intel.com; receiver= Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id D0052100EA55E for ; Mon, 4 Nov 2019 21:29:38 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Nov 2019 21:26:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,270,1569308400"; d="scan'208";a="226984973" Received: from sthodupu-mobl4.amr.corp.intel.com (HELO localhost.localdomain) ([10.252.132.183]) by fmsmga004.fm.intel.com with ESMTP; 04 Nov 2019 21:26:53 -0800 From: Peter Krystad To: mptcp@lists.01.org Date: Mon, 4 Nov 2019 21:26:24 -0800 Message-Id: <20191105052624.3269-1-peter.krystad@linux.intel.com> X-Mailer: git-send-email 2.17.2 Message-ID-Hash: O2J2OWKQKMYYVR76BQ5EXUCQF6OUBGW3 X-Message-ID-Hash: O2J2OWKQKMYYVR76BQ5EXUCQF6OUBGW3 X-MailFrom: peter.krystad@linux.intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [PATCH] mptcp: Use sk_family field in the mptcp_sock for address family. List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 It was not necessary to add a family field to mptcp_sock as it is a wrapper around a struct sock, and sk_family is set correctly when the msk is created as a result of a socket() call. squashto: Associate MPTCP context with TCP socket mptcp: Implement basic path manager Signed-off-by: Peter Krystad --- net/mptcp/basic.c | 5 +++-- net/mptcp/protocol.c | 1 - net/mptcp/protocol.h | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/net/mptcp/basic.c b/net/mptcp/basic.c index 67a93aff500e..03afb1263f3d 100644 --- a/net/mptcp/basic.c +++ b/net/mptcp/basic.c @@ -185,6 +185,7 @@ static void announce_addr_worker(struct work_struct *work) struct mptcp_pm_data *pm = container_of(work, struct mptcp_pm_data, addr_work); struct mptcp_sock *msk = container_of(pm, struct mptcp_sock, pm); + struct sock *sk = (struct sock *)msk; struct basic_pernet *pernet; pernet = net_generic(sock_net((struct sock *)msk), basic_pernet_id); @@ -193,11 +194,11 @@ static void announce_addr_worker(struct work_struct *work) * When the listening socket can accept connections from both * families this restriction may be removed. */ - if (pernet->has_announce_v4 && msk->family == AF_INET) + if (pernet->has_announce_v4 && sk->sk_family == AF_INET) mptcp_pm_announce_addr(pm->token, 1, &pernet->announce_v4_addr); #if IS_ENABLED(CONFIG_IPV6) - else if (pernet->has_announce_v6 && msk->family == AF_INET6) + else if (pernet->has_announce_v6 && sk->sk_family == AF_INET6) mptcp_pm_announce_addr6(pm->token, 1, &pernet->announce_v6_addr); #endif diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 3af5f121af9e..c2b29f8d0377 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1091,7 +1091,6 @@ static struct socket *mptcp_socket_create_get(struct mptcp_sock *msk) } msk->subflow = ssock; - msk->family = ssock->sk->sk_family; subflow = mptcp_subflow_ctx(msk->subflow->sk); subflow->request_mptcp = 1; /* @@ if MPTCP enabled */ subflow->request_version = 0; /* currently only v0 supported */ diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 8fe5f9383d38..791f2c19cfb8 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -133,7 +133,6 @@ struct mptcp_sock { u32 token; unsigned long flags; u16 dport; - sa_family_t family; struct work_struct rtx_work; struct list_head conn_list; struct list_head rtx_queue;