| Message ID | 20170317212146.26079-1-blp@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
On Fri, Mar 17, 2017 at 2:21 PM, Ben Pfaff <blp@ovn.org> wrote: > Reported-by: Timothy Redaelli <tredaelli@redhat.com> > Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2017-March/329604.html > Signed-off-by: Ben Pfaff <blp@ovn.org> Acked-by: Andy Zhou <azhou@ovn.org>
On Thu, Apr 06, 2017 at 11:39:54AM -0700, Andy Zhou wrote: > On Fri, Mar 17, 2017 at 2:21 PM, Ben Pfaff <blp@ovn.org> wrote: > > Reported-by: Timothy Redaelli <tredaelli@redhat.com> > > Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2017-March/329604.html > > Signed-off-by: Ben Pfaff <blp@ovn.org> > Acked-by: Andy Zhou <azhou@ovn.org> Thanks, applied to master.
diff --git a/lib/route-table.c b/lib/route-table.c index ae8af438d864..67fda317638c 100644 --- a/lib/route-table.c +++ b/lib/route-table.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, 2013, 2014 Nicira, Inc. + * Copyright (c) 2011, 2012, 2013, 2014, 2017 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,6 +35,10 @@ #include "rtnetlink.h" #include "openvswitch/vlog.h" +/* Linux 2.6.36 added RTA_MARK, so define it just in case we're building with + * old headers. (We can't test for it with #ifdef because it's an enum.) */ +#define RTA_MARK 16 + VLOG_DEFINE_THIS_MODULE(route_table); struct route_data {
Reported-by: Timothy Redaelli <tredaelli@redhat.com> Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2017-March/329604.html Signed-off-by: Ben Pfaff <blp@ovn.org> --- lib/route-table.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)