Merge branch 'topic/echoaudio' into for-linus

[linux-2.6-omap-h63xx.git] / drivers / net / bonding / bond_ipv6.c

diff --git a/drivers/net/bonding/bond_ipv6.c b/drivers/net/bonding/bond_ipv6.c
index 7c78b7bf671c64b71bb00ee4698c780f63213fff..0d73bf5ac5a5b1014be49e17193b2be6b216809f 100644 (file)
--- a/drivers/net/bonding/bond_ipv6.c
+++ b/drivers/net/bonding/bond_ipv6.c
@@ -20,8 +20,6 @@
  *
  */
 
-//#define BONDING_DEBUG 1
-
 #include <linux/types.h>
 #include <linux/if_vlan.h>
 #include <net/ipv6.h>
@@ -74,8 +72,8 @@ static void bond_na_send(struct net_device *slave_dev,
 
        addrconf_addr_solict_mult(daddr, &mcaddr);
 
-       dprintk("ipv6 na on slave %s: dest %pI6, src %pI6\n",
-              slave->name, &mcaddr, daddr);
+       pr_debug("ipv6 na on slave %s: dest %pI6, src %pI6\n",
+              slave_dev->name, &mcaddr, daddr);
 
        skb = ndisc_build_skb(slave_dev, &mcaddr, daddr, &icmp6h, daddr,
                              ND_OPT_TARGET_LL_ADDR);
@@ -110,7 +108,7 @@ void bond_send_unsolicited_na(struct bonding *bond)
        struct inet6_dev *idev;
        int is_router;
 
-       dprintk("bond_send_unsol_na: bond %s slave %s\n", bond->dev->name,
+       pr_debug("bond_send_unsol_na: bond %s slave %s\n", bond->dev->name,
                                slave ? slave->dev->name : "NULL");
 
        if (!slave || !bond->send_unsol_na ||