| Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 1 | From cbb33e1548fe526c3e7dead294617bde1f087ae3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 24 Aug 2022 16:40:38 -0700 |
| 4 | Subject: [PATCH] port-linux: Re-order header includes |
| 5 | |
| 6 | linux/if.h when included before net/if.h casues duplicate definitions |
| 7 | |
| 8 | Upstream-Status: Iappropriate [Upstream is Dead] |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | --- |
| 11 | Port-linux/interface.c | 2 +- |
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 13 | |
| 14 | diff --git a/Port-linux/interface.c b/Port-linux/interface.c |
| 15 | index 18777e91..19aefb2b 100644 |
| 16 | --- a/Port-linux/interface.c |
| 17 | +++ b/Port-linux/interface.c |
| 18 | @@ -25,7 +25,6 @@ |
| 19 | #include <sys/types.h> |
| 20 | #include <sys/socket.h> |
| 21 | #include <sys/ioctl.h> |
| 22 | -#include <linux/if.h> |
| 23 | #include <syslog.h> |
| 24 | #include <string.h> |
| 25 | #include <errno.h> |
| 26 | @@ -42,6 +41,7 @@ |
| 27 | #include <stdarg.h> |
| 28 | #include <linux/sockios.h> |
| 29 | #include <linux/if_ether.h> |
| 30 | +#include <linux/if.h> |
| 31 | |
| 32 | int interface_auto_up = 0; |
| 33 | int interface_do_message = 0; |