Merge branch 'master' into upstream-fixes

[linux-2.6] / net / irda / irlan / irlan_client.c

diff --git a/net/irda/irlan/irlan_client.c b/net/irda/irlan/irlan_client.c
index a4c1c954582787ced123a932d0c3f8acc5b48f18..fff52d57a2000a3ed974a6765a1d67db99714fdd 100644 (file)
--- a/net/irda/irlan/irlan_client.c
+++ b/net/irda/irlan/irlan_client.c
@@ -20,7 +20,7 @@
  *     published by the Free Software Foundation; either version 2 of
  *     the License, or (at your option) any later version.
  *
- *     Neither Dag Brattli nor University of Tromsø admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
  *     provide warranty for any of this software. This material is
  *     provided "AS-IS" and at no charge.
  *
@@ -436,6 +436,7 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
        __u16 tmp_cpu; /* Temporary value in host order */
        __u8 *bytes;
        int i;
+       DECLARE_MAC_BUF(mac);
 
        IRDA_DEBUG(4, "%s(), parm=%s\n", __FUNCTION__ , param);
 
@@ -520,9 +521,8 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
        /* FILTER_ENTRY, have we got an ethernet address? */
        if (strcmp(param, "FILTER_ENTRY") == 0) {
                bytes = value;
-               IRDA_DEBUG(4, "Ethernet address = %02x:%02x:%02x:%02x:%02x:%02x\n",
-                     bytes[0], bytes[1], bytes[2], bytes[3], bytes[4],
-                     bytes[5]);
+               IRDA_DEBUG(4, "Ethernet address = %s\n",
+                          print_mac(mac, bytes));
                for (i = 0; i < 6; i++)
                        self->dev->dev_addr[i] = bytes[i];
        }