| Message ID | 20170324010227.45375-1-dsa@cumulusnetworks.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 24/03/17 01:02, David Ahern wrote: > 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 <dsa@cumulusnetworks.com> Good catch. Acked-by: Robert Shearman <rshearma@brocade.com>
From: David Ahern <dsa@cumulusnetworks.com> Date: Thu, 23 Mar 2017 19:02:27 -0600 > 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 <dsa@cumulusnetworks.com> Applied.
On 3/24/17 2:29 PM, David Miller wrote: > From: David Ahern <dsa@cumulusnetworks.com> > Date: Thu, 23 Mar 2017 19:02:27 -0600 > >> 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 <dsa@cumulusnetworks.com> > > Applied. > Hi Dave: are you planning to merge net into net-next in the next few days? I have more MPLS patches for net-next but I know there are conflicts with changes in net. Wanted to get those patch sets out before netdev week. Thanks
From: David Ahern <dsa@cumulusnetworks.com> Date: Fri, 24 Mar 2017 14:32:42 -0600 > On 3/24/17 2:29 PM, David Miller wrote: >> From: David Ahern <dsa@cumulusnetworks.com> >> Date: Thu, 23 Mar 2017 19:02:27 -0600 >> >>> 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 <dsa@cumulusnetworks.com> >> >> Applied. >> > > Hi Dave: are you planning to merge net into net-next in the next few > days? I have more MPLS patches for net-next but I know there are > conflicts with changes in net. Wanted to get those patch sets out before > netdev week. I did a merge yesterday, so I am not likely to do another for about a week.
On 3/24/17 3:11 PM, David Miller wrote:
> I did a merge yesterday, so I am not likely to do another for about a week.
hmmm.... some how I missed it. That merge has what I need.
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,
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 <dsa@cumulusnetworks.com> --- net/mpls/af_mpls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)