Merge tag 'v3.9-rc3' into next

Merge with mainline to bring in module_platform_driver_probe() and
devm_ioremap_resource().

1 files changed, 9 insertions, 0 deletions

diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
index d032780d0ce5..ea1e3b863890 100644
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -166,11 +166,20 @@ struct in_ifaddr {
         unsigned char           ifa_flags;
         unsigned char           ifa_prefixlen;
         char                    ifa_label[IFNAMSIZ];
+
+        /* In seconds, relative to tstamp. Expiry is at tstamp + HZ * lft. */
+        __u32                   ifa_valid_lft;
+        __u32                   ifa_preferred_lft;
+        unsigned long           ifa_cstamp; /* created timestamp */
+        unsigned long           ifa_tstamp; /* updated timestamp */
 };
 
 extern int register_inetaddr_notifier(struct notifier_block *nb);
 extern int unregister_inetaddr_notifier(struct notifier_block *nb);
 
+extern void inet_netconf_notify_devconf(struct net *net, int type, int ifindex,
+                                        struct ipv4_devconf *devconf);
+
 extern struct net_device *__ip_dev_find(struct net *net, __be32 addr, bool devref);
 static inline struct net_device *ip_dev_find(struct net *net, __be32 addr)
 {