From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Shearman Subject: [PATCH net-next 1/2] mpls: fix forwarding using v4/v6 explicit null Date: Tue, 27 Oct 2015 00:37:35 +0000 Message-ID: <1445906256-14927-2-git-send-email-rshearma@brocade.com> References: <1445906256-14927-1-git-send-email-rshearma@brocade.com> Mime-Version: 1.0 Content-Type: text/plain Cc: , Roopa Prabhu , "Eric W. Biederman" , Robert Shearman To: Return-path: Received: from mx0a-000f0801.pphosted.com ([67.231.144.122]:33710 "EHLO mx0a-000f0801.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753004AbbJ0AiI (ORCPT ); Mon, 26 Oct 2015 20:38:08 -0400 In-Reply-To: <1445906256-14927-1-git-send-email-rshearma@brocade.com> Sender: netdev-owner@vger.kernel.org List-ID: Fill in the via address length for the predefined IPv4 and IPv6 explicit-null label routes. Fixes: f8efb73c97e2 ("mpls: multipath route support") Signed-off-by: Robert Shearman --- net/mpls/af_mpls.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index cc972e30355b..1c58662db4b2 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -1345,6 +1345,7 @@ static int resize_platform_label_table(struct net *net, size_t limit) rt0->rt_protocol = RTPROT_KERNEL; rt0->rt_payload_type = MPT_IPV4; rt0->rt_nh->nh_via_table = NEIGH_LINK_TABLE; + rt0->rt_nh->nh_via_alen = lo->addr_len; memcpy(rt0->rt_nh->nh_via, lo->dev_addr, lo->addr_len); } if (limit > MPLS_LABEL_IPV6NULL) { @@ -1356,6 +1357,7 @@ static int resize_platform_label_table(struct net *net, size_t limit) rt2->rt_protocol = RTPROT_KERNEL; rt2->rt_payload_type = MPT_IPV6; rt2->rt_nh->nh_via_table = NEIGH_LINK_TABLE; + rt2->rt_nh->nh_via_alen = lo->addr_len; memcpy(rt2->rt_nh->nh_via, lo->dev_addr, lo->addr_len); } -- 2.1.4