Message ID | b4439e27f0c42d429f714b1d8afc69fd3f240fba.1584728932.git.pabeni@redhat.com |
---|---|
State | Accepted, archived |
Delegated to: | Matthieu Baerts |
Headers | show
Return-Path: <mptcp-bounces@lists.01.org> 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=2001:19d0:306:5::1; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=HM04XuE/; dkim-atps=neutral Received: from ml01.01.org (ml01.01.org [IPv6:2001:19d0:306:5::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48kXWg6K4wz9sRY for <incoming@patchwork.ozlabs.org>; Sat, 21 Mar 2020 05:35:11 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 40FA910FC36F1; Fri, 20 Mar 2020 11:35:57 -0700 (PDT) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=216.205.24.74; helo=us-smtp-delivery-74.mimecast.com; envelope-from=pabeni@redhat.com; receiver=<UNKNOWN> Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [216.205.24.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 06AF310FC33F2 for <mptcp@lists.01.org>; Fri, 20 Mar 2020 11:35:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584729304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jJ/sMkI3QCwlBQxd9TkKar7u4qqwcXcCCOGjKJFWiIQ=; b=HM04XuE/vg9QJR0fScnGC6BaLKOsdu91bEti3vf0fJwcjW9U4Ou5uUPSnZx3/MfETzCaIv w1jYfeMXSv/lNhjuhZ5i/2DGljBRHF7599akFf6OrvAwEwvpFXyCtUCbJwcEg/6XB4DqFX kSI0zQ59voyCkhFuS+msLTtqXGK7nkQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-69-sWQaAS5oMMiofp78V1EIvA-1; Fri, 20 Mar 2020 14:35:02 -0400 X-MC-Unique: sWQaAS5oMMiofp78V1EIvA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 59FEC800D4E for <mptcp@lists.01.org>; Fri, 20 Mar 2020 18:35:01 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-114-212.ams2.redhat.com [10.36.114.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id 872CBBBBE8 for <mptcp@lists.01.org>; Fri, 20 Mar 2020 18:35:00 +0000 (UTC) From: Paolo Abeni <pabeni@redhat.com> To: mptcp@lists.01.org Date: Fri, 20 Mar 2020 19:34:39 +0100 Message-Id: <b4439e27f0c42d429f714b1d8afc69fd3f240fba.1584728932.git.pabeni@redhat.com> In-Reply-To: <cover.1584728931.git.pabeni@redhat.com> References: <cover.1584728931.git.pabeni@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: ZNFZ4S3BRYHI6W3E6AJ6VWHGDFFP7OVX X-Message-ID-Hash: ZNFZ4S3BRYHI6W3E6AJ6VWHGDFFP7OVX X-MailFrom: pabeni@redhat.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 v1 1/5] Squash-to: "mptcp: Add ADD_ADDR handling" List-Id: Discussions regarding MPTCP upstreaming <mptcp.lists.01.org> Archived-At: <https://lists.01.org/hyperkitty/list/mptcp@lists.01.org/message/ZNFZ4S3BRYHI6W3E6AJ6VWHGDFFP7OVX/> List-Archive: <https://lists.01.org/hyperkitty/list/mptcp@lists.01.org/> List-Help: <mailto:mptcp-request@lists.01.org?subject=help> List-Post: <mailto:mptcp@lists.01.org> List-Subscribe: <mailto:mptcp-join@lists.01.org> List-Unsubscribe: <mailto:mptcp-leave@lists.01.org> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit |
Series |
squash and cleanup
|
expand
|
diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 9b90bdc419ac..633bda691fff 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -486,9 +486,6 @@ static bool mptcp_established_options_addr(struct sock *sk, struct sockaddr_storage saddr; u8 id; - if (!msk) - return false; - id = 0; memset(&saddr, 0, sizeof(saddr));
subflow->conn is always valid for is_mptcp socket, drop unneeded check Signed-off-by: Paolo Abeni <pabeni@redhat.com> --- net/mptcp/options.c | 3 --- 1 file changed, 3 deletions(-)