Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd

[linux-2.6-omap-h63xx.git] / include / linux / inetdevice.h

diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
index 7009b0cdd06fe1dc7b294e788ff61b6d3db1c141..06fcdb45106bb1a39c5c7606345cd3c0d8487743 100644 (file)
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -25,6 +25,7 @@ struct in_device
        struct in_ifaddr        *ifa_list;      /* IP ifaddr chain              */
        rwlock_t                mc_list_lock;
        struct ip_mc_list       *mc_list;       /* IP multicast filter chain    */
+       int                     mc_count;                 /* Number of installed mcasts */
        spinlock_t              mc_tomb_lock;
        struct ip_mc_list       *mc_tomb;
        unsigned long           mr_v1_seen;
@@ -117,7 +118,6 @@ struct in_ifaddr
        __be32                  ifa_address;
        __be32                  ifa_mask;
        __be32                  ifa_broadcast;
-       __be32                  ifa_anycast;
        unsigned char           ifa_scope;
        unsigned char           ifa_flags;
        unsigned char           ifa_prefixlen;