1 files changed, 4 insertions, 5 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 79b79f3de24c..24424c3b7dc0 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1034,7 +1034,7 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev,
                         }
 
                         /* Rule 4: Prefer home address */
-#ifdef CONFIG_IPV6_MIP6
+#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
                         if (hiscore.rule < 4) {
                                 if (ifa_result->flags & IFA_F_HOMEADDRESS)
                                         hiscore.attrs |= IPV6_SADDR_SCORE_HOA;
@@ -2785,7 +2785,7 @@ static int if6_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static struct seq_operations if6_seq_ops = {
+static const struct seq_operations if6_seq_ops = {
         .start  = if6_seq_start,
         .next   = if6_seq_next,
         .show   = if6_seq_show,
@@ -2835,7 +2835,7 @@ void if6_proc_exit(void)
 }
 #endif  /* CONFIG_PROC_FS */
 
-#ifdef CONFIG_IPV6_MIP6
+#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
 /* Check if address is a home address configured on any interface. */
 int ipv6_chk_home_addr(struct in6_addr *addr)
 {
@@ -4243,7 +4243,6 @@ errout:
 void __exit addrconf_cleanup(void)
 {
         struct net_device *dev;
-        struct inet6_dev *idev;
         struct inet6_ifaddr *ifa;
         int i;
 
@@ -4261,7 +4260,7 @@ void __exit addrconf_cleanup(void)
          */
 
         for_each_netdev(dev) {
-                if ((idev = __in6_dev_get(dev)) == NULL)
+                if (__in6_dev_get(dev) == NULL)
                         continue;
                 addrconf_ifdown(dev, 1);
         }