1 files changed, 12 insertions, 12 deletions

diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c
index 3d1655f98388..6c5c6dc098ec 100644
--- a/net/appletalk/aarp.c
+++ b/net/appletalk/aarp.c
@@ -330,15 +330,19 @@ static void aarp_expire_timeout(unsigned long unused)
 static int aarp_device_event(struct notifier_block *this, unsigned long event,
                              void *ptr)
 {
+        struct net_device *dev = ptr;
         int ct;
 
+        if (dev->nd_net != &init_net)
+                return NOTIFY_DONE;
+
         if (event == NETDEV_DOWN) {
                 write_lock_bh(&aarp_lock);
 
                 for (ct = 0; ct < AARP_HASH_SIZE; ct++) {
-                        __aarp_expire_device(&resolved[ct], ptr);
-                        __aarp_expire_device(&unresolved[ct], ptr);
-                        __aarp_expire_device(&proxies[ct], ptr);
+                        __aarp_expire_device(&resolved[ct], dev);
+                        __aarp_expire_device(&unresolved[ct], dev);
+                        __aarp_expire_device(&proxies[ct], dev);
                 }
 
                 write_unlock_bh(&aarp_lock);
@@ -712,6 +716,9 @@ static int aarp_rcv(struct sk_buff *skb, struct net_device *dev,
         struct atalk_addr sa, *ma, da;
         struct atalk_iface *ifa;
 
+        if (dev->nd_net != &init_net)
+                goto out0;
+
         /* We only do Ethernet SNAP AARP. */
         if (dev->type != ARPHRD_ETHER)
                 goto out0;
@@ -815,8 +822,6 @@ static int aarp_rcv(struct sk_buff *skb, struct net_device *dev,
                                  * address. So as a precaution flush any
                                  * entries we have for this address.
                                  */
-                                struct aarp_entry *a;
-
                                 a = __aarp_find_entry(resolved[sa.s_node %
                                                           (AARP_HASH_SIZE - 1)],
                                                       skb->dev, &sa);
@@ -990,6 +995,7 @@ static int aarp_seq_show(struct seq_file *seq, void *v)
         struct aarp_iter_state *iter = seq->private;
         struct aarp_entry *entry = v;
         unsigned long now = jiffies;
+        DECLARE_MAC_BUF(mac);
 
         if (v == SEQ_START_TOKEN)
                 seq_puts(seq,
@@ -1000,13 +1006,7 @@ static int aarp_seq_show(struct seq_file *seq, void *v)
                            ntohs(entry->target_addr.s_net),
                            (unsigned int) entry->target_addr.s_node,
                            entry->dev ? entry->dev->name : "????");
-                seq_printf(seq, "%02X:%02X:%02X:%02X:%02X:%02X",
-                           entry->hwaddr[0] & 0xFF,
-                           entry->hwaddr[1] & 0xFF,
-                           entry->hwaddr[2] & 0xFF,
-                           entry->hwaddr[3] & 0xFF,
-                           entry->hwaddr[4] & 0xFF,
-                           entry->hwaddr[5] & 0xFF);
+                seq_printf(seq, "%s", print_mac(mac, entry->hwaddr));
                 seq_printf(seq, " %8s",
                            dt2str((long)entry->expires_at - (long)now));
                 if (iter->table == unresolved)