From patchwork Thu Apr 26 19:58:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Ricardo Leitner X-Patchwork-Id: 905360 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CFSlBKeo"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40X7Lj14Fcz9s02 for ; Fri, 27 Apr 2018 06:04:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757137AbeDZUEG (ORCPT ); Thu, 26 Apr 2018 16:04:06 -0400 Received: from mail-qk0-f196.google.com ([209.85.220.196]:39123 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755546AbeDZT7a (ORCPT ); Thu, 26 Apr 2018 15:59:30 -0400 Received: by mail-qk0-f196.google.com with SMTP id z75so15614549qkb.6; Thu, 26 Apr 2018 12:59:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1zLZjJRjLiuEdmh6wgGnl1xXplpgjWE3DHCRa0u/Ptg=; b=CFSlBKeoNyvQBQD++8bN0STeOMkL9O/pFRk80vhtl9sYp26G7O+SGmcjav1gP6OGRT 3awtdaCtuslUkd6n4gsopPf4Q+h9R4LP0DvnxHszneHijBQKakT3wWpK6aZC4PpANiEb 0hZGAv4WrntLfQYZTqT090OKwWr+gAtBK4bsn1pRQCfCG+Ht6wqmPDAqXMZAmAs6jIh+ DTpvdN/PTRL/EMByuCaw2zs2G6U4KLA8/fqfk904qCxX2vZFVnVSzyZ9X1gUnl902GDD ByPzwH2E7vte8SW/Cp0U9zbGFoMm3VQmtTYoZLzO0CtcLpSbu0Q5ILOfYyQDoti+ICyH 57og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1zLZjJRjLiuEdmh6wgGnl1xXplpgjWE3DHCRa0u/Ptg=; b=KN9QPdg7ymsw7hX+xRYSCd302+TRmYasgmcXZxdaObW9y64pVFSGhmmmCpkl9JcB9E Xt1dTEkWqX/8vCnfYsfHTM40HP0jtwuf9+hJlkW1O5kw6bRup7LE4OlL+ArRU1tLz/w9 8557z8unSICdXDkIDIrSJ0glmhJXy0p0lZqsEKJX1laGaFlEdQ0HX18PJESi1RBYb/Wd jxgBzTWDJdB5rsdUXyfte5R0tYhtWqUM/8XH7WeQStEgo9VFZ3ZhxBlnws49QGlY5611 fa+g9wd/qmmcdxT1xsZewX0pkuzZhcdtv1mzOsUvJOE4JeeWV+wS8lbgEVbwAWU9mHNJ VwaQ== X-Gm-Message-State: ALQs6tCGUDJdmzEAmwR8L34zb+VtHnM85matSX/iIkR/C59WTpZ8t2UO KpWbU4hYW9rqzgJCVqXzWZo= X-Google-Smtp-Source: AB8JxZpxG3x8vKOXSF7THjdg+SXIEg/MAFC48hYfW2qLrfWB+8hjRz9x+9XiQWanfblDOPNsn8hO5A== X-Received: by 10.233.237.16 with SMTP id c16mr34953150qkg.344.1524772769217; Thu, 26 Apr 2018 12:59:29 -0700 (PDT) Received: from localhost.localdomain ([177.10.56.95]) by smtp.gmail.com with ESMTPSA id u24sm1086627qku.18.2018.04.26.12.59.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Apr 2018 12:59:28 -0700 (PDT) Received: by localhost.localdomain (Postfix, from userid 1000) id F16E2181165; Thu, 26 Apr 2018 16:59:18 -0300 (-03) From: Marcelo Ricardo Leitner To: netdev@vger.kernel.org Cc: linux-sctp@vger.kernel.org, Vlad Yasevich , Neil Horman , Xin Long Subject: [PATCH net-next 09/13] sctp: remove sctp_transport_pmtu_check Date: Thu, 26 Apr 2018 16:58:58 -0300 Message-Id: X-Mailer: git-send-email 2.14.3 In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We are now keeping the MTU information synced between asoc, transport and dst, which makes the check at sctp_packet_config() not needed anymore. As it was the sole caller to this function, lets remove it. Signed-off-by: Marcelo Ricardo Leitner --- include/net/sctp/sctp.h | 12 ------------ net/sctp/output.c | 3 --- 2 files changed, 15 deletions(-) diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index 4965cbfa7d92c0f60a76dd6e03571f78209dda5a..f66d4435000799f523fbaa34b0a57dbdeebda040 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h @@ -606,16 +606,4 @@ static inline __u32 sctp_dst_mtu(const struct dst_entry *dst) SCTP_DEFAULT_MINSEGMENT)); } -static inline bool sctp_transport_pmtu_check(struct sctp_transport *t) -{ - __u32 pmtu = sctp_dst_mtu(t->dst); - - if (t->pathmtu == pmtu) - return true; - - t->pathmtu = pmtu; - - return false; -} - #endif /* __net_sctp_h__ */ diff --git a/net/sctp/output.c b/net/sctp/output.c index bf4226c3cc1de79f2041d55a68ea53f4fd600b25..e672dee302c7092433a64ed3ed8bfcd183e1f9c8 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c @@ -118,9 +118,6 @@ void sctp_packet_config(struct sctp_packet *packet, __u32 vtag, sctp_transport_route(tp, NULL, sp); if (asoc->param_flags & SPP_PMTUD_ENABLE) sctp_assoc_sync_pmtu(asoc); - } else if (!sctp_transport_pmtu_check(tp)) { - if (asoc->param_flags & SPP_PMTUD_ENABLE) - sctp_assoc_sync_pmtu(asoc); } /* If there a is a prepend chunk stick it on the list before