Merge upstream kernel changes into 'C/H/S support' branch of libata.

1 files changed, 2 insertions, 0 deletions

diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
index 6fafb27877..7e1e15f934 100644
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -29,6 +29,7 @@ struct ipv4_devconf
         int     no_xfrm;
         int     no_policy;
         int     force_igmp_version;
+        int     promote_secondaries;
         void    *sysctl;
 };
 
@@ -71,6 +72,7 @@ struct in_device
 #define IN_DEV_SEC_REDIRECTS(in_dev)    (ipv4_devconf.secure_redirects || (in_dev)->cnf.secure_redirects)
 #define IN_DEV_IDTAG(in_dev)            ((in_dev)->cnf.tag)
 #define IN_DEV_MEDIUM_ID(in_dev)        ((in_dev)->cnf.medium_id)
+#define IN_DEV_PROMOTE_SECONDARIES(in_dev)      (ipv4_devconf.promote_secondaries || (in_dev)->cnf.promote_secondaries)
 
 #define IN_DEV_RX_REDIRECTS(in_dev) \
         ((IN_DEV_FORWARD(in_dev) && \