| Message ID | 1445906256-14927-2-git-send-email-rshearma@brocade.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 10/26/15, 5:37 PM, Robert Shearman wrote: > 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 <rshearma@brocade.com> > --- > 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); > } > Acked-by: Roopa Prabhu <roopa@cumulusnetworks.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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); }
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 <rshearma@brocade.com> --- net/mpls/af_mpls.c | 2 ++ 1 file changed, 2 insertions(+)