| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame^] | 1 | From a5b945cb3c62a18dcd7047f62707c09076c4e48b Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 12 Jul 2017 15:35:51 -0700 |
| 4 | Subject: [PATCH 2/2] teamd: Re-adjust include header order |
| 5 | |
| 6 | So it gets the library definition before kernel definition |
| 7 | |
| 8 | usr/include/ne |
| 9 | tinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' |
| 10 | struct ethhdr { |
| 11 | ^~~~~~ |
| 12 | |
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 14 | --- |
| 15 | teamd/teamd_runner_lacp.c | 2 +- |
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 17 | |
| 18 | diff --git a/teamd/teamd_runner_lacp.c b/teamd/teamd_runner_lacp.c |
| 19 | index 9c77fae..8800854 100644 |
| 20 | --- a/teamd/teamd_runner_lacp.c |
| 21 | +++ b/teamd/teamd_runner_lacp.c |
| 22 | @@ -23,6 +23,7 @@ |
| 23 | #include <unistd.h> |
| 24 | #include <limits.h> |
| 25 | #include <sys/ioctl.h> |
| 26 | +#include <net/ethernet.h> |
| 27 | #include <linux/if_ether.h> |
| 28 | #include <sys/socket.h> |
| 29 | #include <linux/netdevice.h> |
| 30 | @@ -30,7 +31,6 @@ |
| 31 | #include <errno.h> |
| 32 | #include <team.h> |
| 33 | #include <private/misc.h> |
| 34 | -#include <net/ethernet.h> |
| 35 | |
| 36 | #include "teamd.h" |
| 37 | #include "teamd_config.h" |
| 38 | -- |
| 39 | 2.13.2 |
| 40 | |