1*4882a593SmuzhiyunFrom b13440627bd4a9f060a33d400a47a40daa2bc12e Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Petr Vorel <petr.vorel@gmail.com> 3*4882a593SmuzhiyunDate: Wed, 29 Sep 2021 19:37:19 +0200 4*4882a593SmuzhiyunSubject: [PATCH] lapi: Create if_addr.h and reuse it in rtnetlink.h 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThere will be fix in next commit for missing IFA_F_NOPREFIXROUTE which 7*4882a593Smuzhiyunrequires creating lapi/if_addr.h. Thus move IFA_FLAGS to lapi/if_addr.h, 8*4882a593Smuzhiyunas it belongs there and reuse lapi/if_addr.h in lapi/rtnetlink.h just 9*4882a593Smuzhiyunlike <linux/rtnetlink.h> includes <linux/if_addr.h>. 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunSigned-off-by: Petr Vorel <petr.vorel@gmail.com> 12*4882a593Smuzhiyun[ upstream status: https://lore.kernel.org/ltp/20210930183058.5240-3-petr.vorel@gmail.com/T/#u ] 13*4882a593Smuzhiyun--- 14*4882a593Smuzhiyun include/lapi/if_addr.h | 16 ++++++++++++++++ 15*4882a593Smuzhiyun include/lapi/rtnetlink.h | 5 +---- 16*4882a593Smuzhiyun 2 files changed, 17 insertions(+), 4 deletions(-) 17*4882a593Smuzhiyun create mode 100644 include/lapi/if_addr.h 18*4882a593Smuzhiyun 19*4882a593Smuzhiyundiff --git a/include/lapi/if_addr.h b/include/lapi/if_addr.h 20*4882a593Smuzhiyunnew file mode 100644 21*4882a593Smuzhiyunindex 000000000..4e50a0a4e 22*4882a593Smuzhiyun--- /dev/null 23*4882a593Smuzhiyun+++ b/include/lapi/if_addr.h 24*4882a593Smuzhiyun@@ -0,0 +1,16 @@ 25*4882a593Smuzhiyun+// SPDX-License-Identifier: GPL-2.0-or-later 26*4882a593Smuzhiyun+/* 27*4882a593Smuzhiyun+ * Copyright (c) 2021 Petr Vorel <petr.vorel@gmail.com> 28*4882a593Smuzhiyun+ */ 29*4882a593Smuzhiyun+ 30*4882a593Smuzhiyun+#ifndef LAPI_IF_ADDR_H__ 31*4882a593Smuzhiyun+#define LAPI_IF_ADDR_H__ 32*4882a593Smuzhiyun+ 33*4882a593Smuzhiyun+#include <linux/if_addr.h> 34*4882a593Smuzhiyun+ 35*4882a593Smuzhiyun+#ifndef IFA_FLAGS 36*4882a593Smuzhiyun+# define IFA_FLAGS 8 37*4882a593Smuzhiyun+#endif 38*4882a593Smuzhiyun+ 39*4882a593Smuzhiyun+ 40*4882a593Smuzhiyun+#endif /* LAPI_IF_ADDR_H__ */ 41*4882a593Smuzhiyundiff --git a/include/lapi/rtnetlink.h b/include/lapi/rtnetlink.h 42*4882a593Smuzhiyunindex 04e9ad51a..089bf1a0d 100644 43*4882a593Smuzhiyun--- a/include/lapi/rtnetlink.h 44*4882a593Smuzhiyun+++ b/include/lapi/rtnetlink.h 45*4882a593Smuzhiyun@@ -5,9 +5,6 @@ 46*4882a593Smuzhiyun # define LAPI_RTNETLINK_H__ 47*4882a593Smuzhiyun 48*4882a593Smuzhiyun #include <linux/rtnetlink.h> 49*4882a593Smuzhiyun- 50*4882a593Smuzhiyun-#ifndef IFA_FLAGS 51*4882a593Smuzhiyun-# define IFA_FLAGS 8 52*4882a593Smuzhiyun-#endif 53*4882a593Smuzhiyun+#include "lapi/if_addr.h" 54*4882a593Smuzhiyun 55*4882a593Smuzhiyun #endif /* LAPI_RTNETLINK_H__ */ 56*4882a593Smuzhiyun-- 57*4882a593Smuzhiyun2.33.0 58*4882a593Smuzhiyun 59