string: factorize skip_spaces and export it to be generally available

[safe/jmp/linux-2.6] / include / linux / if_addr.h

diff --git a/include/linux/if_addr.h b/include/linux/if_addr.h
index e159045..23357ab 100644 (file)
--- a/include/linux/if_addr.h
+++ b/include/linux/if_addr.h
@@ -1,10 +1,10 @@
 #ifndef __LINUX_IF_ADDR_H
 #define __LINUX_IF_ADDR_H
 
+#include <linux/types.h>
 #include <linux/netlink.h>
 
-struct ifaddrmsg
-{
+struct ifaddrmsg {
        __u8            ifa_family;
        __u8            ifa_prefixlen;  /* The prefix length            */
        __u8            ifa_flags;      /* Flags                        */
@@ -19,8 +19,7 @@ struct ifaddrmsg
  * but for point-to-point IFA_ADDRESS is DESTINATION address,
  * local address is supplied in IFA_LOCAL attribute.
  */
-enum
-{
+enum {
        IFA_UNSPEC,
        IFA_ADDRESS,
        IFA_LOCAL,
@@ -38,16 +37,25 @@ enum
 #define IFA_F_SECONDARY                0x01
 #define IFA_F_TEMPORARY                IFA_F_SECONDARY
 
+#define        IFA_F_NODAD             0x02
+#define IFA_F_OPTIMISTIC       0x04
+#define IFA_F_DADFAILED                0x08
+#define        IFA_F_HOMEADDRESS       0x10
 #define IFA_F_DEPRECATED       0x20
 #define IFA_F_TENTATIVE                0x40
 #define IFA_F_PERMANENT                0x80
 
-struct ifa_cacheinfo
-{
+struct ifa_cacheinfo {
        __u32   ifa_prefered;
        __u32   ifa_valid;
        __u32   cstamp; /* created 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