On 19 June 2017 at 15:05, Greg Rose <gvrose8...@gmail.com> wrote: > On 06/19/2017 02:33 PM, Joe Stringer wrote: >> >> Fix minor style variations and unnecessary includes. >> >> Signed-off-by: Joe Stringer <j...@ovn.org> >> --- >> lib/netdev-linux.c | 1 + >> lib/netdev-tc-offloads.c | 11 ++++++----- >> lib/tc.c | 6 ++++-- >> lib/tc.h | 4 ++-- >> 4 files changed, 13 insertions(+), 9 deletions(-) >> >> diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c >> index f5dc30fbc188..6978c44c796a 100644 >> --- a/lib/netdev-linux.c >> +++ b/lib/netdev-linux.c >> @@ -29,6 +29,7 @@ >> #include <linux/types.h> >> #include <linux/ethtool.h> >> #include <linux/mii.h> >> +#include <linux/rtnetlink.h> >> #include <linux/sockios.h> >> #include <sys/types.h> >> #include <sys/ioctl.h> >> diff --git a/lib/netdev-tc-offloads.c b/lib/netdev-tc-offloads.c >> index 940e20ff2759..621402303c8d 100644 >> --- a/lib/netdev-tc-offloads.c >> +++ b/lib/netdev-tc-offloads.c >> @@ -16,24 +16,25 @@ >> >> #include <config.h> >> #include "netdev-tc-offloads.h" >> + >> #include <errno.h> >> #include <linux/if_ether.h> >> + >> +#include "dpif.h" >> +#include "hash.h" >> #include "openvswitch/hmap.h" >> #include "openvswitch/match.h" >> #include "openvswitch/ofpbuf.h" >> #include "openvswitch/thread.h" >> #include "openvswitch/types.h" >> #include "openvswitch/vlog.h" >> -#include "netdev-provider.h" >> +#include "netdev-linux.h" >> #include "netlink.h" >> #include "netlink-socket.h" >> #include "odp-netlink.h" >> +#include "tc.h" >> #include "unaligned.h" >> #include "util.h" >> -#include "hash.h" >> -#include "dpif.h" >> -#include "tc.h" >> -#include "netdev-linux.h" >> >> VLOG_DEFINE_THIS_MODULE(netdev_tc_offloads); >> >> diff --git a/lib/tc.c b/lib/tc.c >> index 9ca7b76ce27f..401690ec98c7 100644 >> --- a/lib/tc.c >> +++ b/lib/tc.c >> @@ -1,5 +1,5 @@ >> /* >> - * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 >> Nicira, Inc. >> + * Copyright (c) 2009-2017 Nicira, Inc. >> * Copyright (c) 2016 Mellanox Technologies, Ltd. >> * >> * Licensed under the Apache License, Version 2.0 (the "License"); >> @@ -17,6 +17,7 @@ >> >> #include <config.h> >> #include "tc.h" >> + >> #include <errno.h> >> #include <linux/if_ether.h> >> #include <linux/rtnetlink.h> >> @@ -26,6 +27,7 @@ >> #include <linux/tc_act/tc_vlan.h> >> #include <linux/gen_stats.h> >> #include <net/if.h> >> + >> #include "byte-order.h" >> #include "netlink-socket.h" >> #include "netlink.h" >> @@ -33,7 +35,7 @@ >> #include "openvswitch/vlog.h" >> #include "packets.h" >> #include "timeval.h" >> -#include <unaligned.h> >> +#include "unaligned.h" >> >> VLOG_DEFINE_THIS_MODULE(tc); >> >> diff --git a/lib/tc.h b/lib/tc.h >> index 61188dd43ec3..1cc7362d59ae 100644 >> --- a/lib/tc.h >> +++ b/lib/tc.h >> @@ -21,8 +21,8 @@ >> #include <netinet/in.h> /* Must happen before linux/pkt_cls.h - Glibc >> #20215 */ >> #include <linux/pkt_cls.h> >> #include <linux/pkt_sched.h> >> -#include <linux/rtnetlink.h> >> -#include "lib/netlink-socket.h" >> + >> +#include "netlink-socket.h" >> #include "odp-netlink.h" >> #include "openvswitch/ofpbuf.h" >> >> > Both patches in the series compile tested with glibc 2.17 and kernel 4.9. > > LGTM > > Tested-by: Greg Rose <gvrose8...@gmail.com> > Acked-by: Greg Rose <gvrose8...@gmail.com>
Thanks, I applied the series to master. _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
