Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 1 | commit cd90fd147844a0cfec101f1e2db7a3c59d236621 |
| 2 | Author: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 3 | Date: Wed Dec 28 14:11:22 2016 +0200 |
| 4 | |
| 5 | pppol2tp plugin: Remove unneeded include |
| 6 | |
| 7 | The include is not required and will break compile on musl libc with |
| 8 | |
| 9 | | In file included from pppol2tp.c:34:0: |
| 10 | | /usr/include/linux/if.h:97:2: error: expected identifier before numeric constant |
| 11 | | IFF_LOWER_UP = 1<<16, /* __volatile__ */ |
| 12 | |
| 13 | Patch originally from Khem Raj. |
| 14 | |
| 15 | Upstream-Status: Pending [https://github.com/paulusmack/ppp/issues/73] |
| 16 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 17 | |
| 18 | diff --git a/pppd/plugins/pppol2tp/openl2tp.c b/pppd/plugins/pppol2tp/openl2tp.c |
| 19 | index 9643b96..458316b 100644 |
| 20 | --- a/pppd/plugins/pppol2tp/openl2tp.c |
| 21 | +++ b/pppd/plugins/pppol2tp/openl2tp.c |
| 22 | @@ -47,7 +47,6 @@ |
| 23 | #include <linux/if_ether.h> |
| 24 | #include <linux/ppp_defs.h> |
| 25 | #include <linux/if_ppp.h> |
| 26 | -#include <linux/if_pppox.h> |
| 27 | #include <linux/if_pppol2tp.h> |
| 28 | |
| 29 | #include "l2tp_event.h" |
| 30 | diff --git a/pppd/plugins/pppol2tp/pppol2tp.c b/pppd/plugins/pppol2tp/pppol2tp.c |
| 31 | index 0e28606..4f6d98c 100644 |
| 32 | --- a/pppd/plugins/pppol2tp/pppol2tp.c |
| 33 | +++ b/pppd/plugins/pppol2tp/pppol2tp.c |
| 34 | @@ -46,7 +46,6 @@ |
| 35 | #include <linux/if_ether.h> |
| 36 | #include <linux/ppp_defs.h> |
| 37 | #include <linux/if_ppp.h> |
| 38 | -#include <linux/if_pppox.h> |
| 39 | #include <linux/if_pppol2tp.h> |
| 40 | |
| 41 | /* should be added to system's socket.h... */ |
| 42 | --- |
| 43 | |