From patchwork Fri Mar 24 01:02:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 743001 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 3vq4s93fKbz9s1h for ; Fri, 24 Mar 2017 12:02:37 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="K1EyrLFy"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965171AbdCXBCe (ORCPT ); Thu, 23 Mar 2017 21:02:34 -0400 Received: from mail-pf0-f172.google.com ([209.85.192.172]:35320 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934663AbdCXBCc (ORCPT ); Thu, 23 Mar 2017 21:02:32 -0400 Received: by mail-pf0-f172.google.com with SMTP id 20so194417pfk.2 for ; Thu, 23 Mar 2017 18:02:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id; bh=aeMvhM+YIHKWV+Vui+QQgP8igEsHrr6dz6P+JqmcbCc=; b=K1EyrLFyQJ9FVEYH298HnKUL+6g+q5tX9WqUbkyyrqHO7xQKVATAhDImh65FVymfwn Hh34etDJVvkHXN81xWmIyD4HT946KwOcPqmPDOWmhnFSUykYmkikSc+P/1xs1lBHlFCC fa+HgBwMJikq/L3ZI3R2XcIEigZxLFHQa2VXw= 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; bh=aeMvhM+YIHKWV+Vui+QQgP8igEsHrr6dz6P+JqmcbCc=; b=GkwIlUkXDUVFoLPnftIs30w+JfmlwI6ZUEDoJdxGBuFYCLeDVhOp5x+mXkCxWnjIxp l/rx3kYr5V5bSySc4t8oFI/4lJXpgQtFuvhJDgugCHNQ75u9lyCbuWhEgI7tRvSH40NG HtN0LCJ+f/2IYnEf2j7TZdys/IJdFPLcUueRpWKkKatB2EFk3B7+QOiilkR47NkKMHZK 5+IrVwGX0n+td62jM5cvw9iuj9zaXCRg76oGTQpuL++oE7jmLDs+OIExINsy92rgjCua p/PiX6xmO9G+sNKRdCG8MtBJSSrNkoHyUqqejcnTID0RR6sd4wXwRl+yMo8MnW4OP6pT qAxw== X-Gm-Message-State: AFeK/H0x3RFFEzU+cN6M3RmIOjRd7VQdHUtfMm9DQq1qLzdTYbxCR1KRi+rd6M9T8tU92bMD X-Received: by 10.99.104.199 with SMTP id d190mr5770811pgc.141.1490317351010; Thu, 23 Mar 2017 18:02:31 -0700 (PDT) Received: from dsa.it.cumulusnetworks.com. ([216.129.126.118]) by smtp.googlemail.com with ESMTPSA id m6sm561863pgn.58.2017.03.23.18.02.29 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 23 Mar 2017 18:02:30 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org Cc: rshearma@brocade.com, David Ahern Subject: [PATCH net-next] net: mpls: Fix setting ttl_propagate for rt2 Date: Thu, 23 Mar 2017 19:02:27 -0600 Message-Id: <20170324010227.45375-1-dsa@cumulusnetworks.com> X-Mailer: git-send-email 2.10.1 (Apple Git-78) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix copy and paste error setting rt_ttl_propagate. Fixes: 5b441ac8784c1 ("mpls: allow TTL propagation to IP packets to be configured") Signed-off-by: David Ahern Acked-by: Robert Shearman --- net/mpls/af_mpls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index 82589b2abf3c..cd8be8d5e4ad 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -1949,7 +1949,7 @@ static int resize_platform_label_table(struct net *net, size_t limit) RCU_INIT_POINTER(rt2->rt_nh->nh_dev, lo); rt2->rt_protocol = RTPROT_KERNEL; rt2->rt_payload_type = MPT_IPV6; - rt0->rt_ttl_propagate = MPLS_TTL_PROP_DEFAULT; + rt2->rt_ttl_propagate = MPLS_TTL_PROP_DEFAULT; rt2->rt_nh->nh_via_table = NEIGH_LINK_TABLE; rt2->rt_nh->nh_via_alen = lo->addr_len; memcpy(__mpls_nh_via(rt2, rt2->rt_nh), lo->dev_addr,