Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[safe/jmp/linux-2.6] / net / appletalk / aarp.c

diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c
index b25c1e9..89f99d3 100644 (file)
--- a/net/appletalk/aarp.c
+++ b/net/appletalk/aarp.c
@@ -443,13 +443,14 @@ static void aarp_send_probe_phase1(struct atalk_iface *iface)
 {
        struct ifreq atreq;
        struct sockaddr_at *sa = (struct sockaddr_at *)&atreq.ifr_addr;
+       const struct net_device_ops *ops = iface->dev->netdev_ops;
 
        sa->sat_addr.s_node = iface->address.s_node;
        sa->sat_addr.s_net = ntohs(iface->address.s_net);
 
        /* We pass the Net:Node to the drivers/cards by a Device ioctl. */
-       if (!(iface->dev->do_ioctl(iface->dev, &atreq, SIOCSIFADDR))) {
-               (void)iface->dev->do_ioctl(iface->dev, &atreq, SIOCGIFADDR);
+       if (!(ops->ndo_do_ioctl(iface->dev, &atreq, SIOCSIFADDR))) {
+               ops->ndo_do_ioctl(iface->dev, &atreq, SIOCGIFADDR);
                if (iface->address.s_net != htons(sa->sat_addr.s_net) ||
                    iface->address.s_node != sa->sat_addr.s_node)
                        iface->status |= ATIF_PROBE_FAIL;
@@ -995,7 +996,6 @@ 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,
@@ -1006,7 +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, "%s", print_mac(mac, entry->hwaddr));
+               seq_printf(seq, "%pM", entry->hwaddr);
                seq_printf(seq, " %8s",
                           dt2str((long)entry->expires_at - (long)now));
                if (iter->table == unresolved)