From: Paul Mackerras <paulus@ozlabs.org>
Date: Fri, 5 Aug 2022 04:10:40 +0000 (+1000)
Subject: Merge pull request #354 from pali/register-with-name
X-Git-Tag: ppp-2.5.0~33
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=607d8eadccfd62c1fa84a36bd1440bd48b4e55ca;p=ppp.git

Merge pull request #354 from pali/register-with-name

pppd: Add support for registering ppp interface via Linux rtnetlink API
---

607d8eadccfd62c1fa84a36bd1440bd48b4e55ca
diff --cc pppd/sys-linux.c
index ff3a249,6eed86f..e7f851c
--- a/pppd/sys-linux.c
+++ b/pppd/sys-linux.c
@@@ -131,6 -131,11 +131,7 @@@
  #include <linux/netlink.h>
  #include <linux/rtnetlink.h>
  #include <linux/if_link.h>
+ 
 -#ifdef INET6
 -#include <linux/if_addr.h>
 -#endif
 -
  /* Attempt at retaining compile-support with older than 4.7 kernels, or kernels
   * where RTM_NEWSTATS isn't defined for whatever reason.
   */
@@@ -138,8 -143,8 +139,10 @@@
  #define RTM_NEWSTATS 92
  #define RTM_GETSTATS 94
  #define IFLA_STATS_LINK_64 1
+ #endif
  
 +#include <linux/if_addr.h>
++
  /* glibc versions prior to 2.24 do not define SOL_NETLINK */
  #ifndef SOL_NETLINK
  #define SOL_NETLINK 270