projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
if_addr.h
diff --git
a/include/linux/if_addr.h
b/include/linux/if_addr.h
index dbe8f6120a40ba4bc8c93cfecd0707dd65d865c4..43f3bedaafd3c295c29f57082a7d51aaeb4f0bfb 100644
(file)
--- a/
include/linux/if_addr.h
+++ b/
include/linux/if_addr.h
@@
-39,6
+39,7
@@
enum
#define IFA_F_TEMPORARY IFA_F_SECONDARY
#define IFA_F_NODAD 0x02
#define IFA_F_TEMPORARY IFA_F_SECONDARY
#define IFA_F_NODAD 0x02
+#define IFA_F_OPTIMISTIC 0x04
#define IFA_F_HOMEADDRESS 0x10
#define IFA_F_DEPRECATED 0x20
#define IFA_F_TENTATIVE 0x40
#define IFA_F_HOMEADDRESS 0x10
#define IFA_F_DEPRECATED 0x20
#define IFA_F_TENTATIVE 0x40
@@
-52,4
+53,10
@@
struct ifa_cacheinfo
__u32 tstamp; /* updated timestamp, hundredths of seconds */
};
__u32 tstamp; /* updated timestamp, hundredths of seconds */
};
+/* backwards compatibility for userspace */
+#ifndef __KERNEL__
+#define IFA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
+#define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg))
+#endif
+
#endif
#endif