diff options
Diffstat (limited to 'drivers/net/bonding/bond_alb.c')
-rw-r--r-- | drivers/net/bonding/bond_alb.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index f0dde1888c71..27fb7f5c21cf 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c | |||
@@ -20,8 +20,6 @@ | |||
20 | * | 20 | * |
21 | */ | 21 | */ |
22 | 22 | ||
23 | //#define BONDING_DEBUG 1 | ||
24 | |||
25 | #include <linux/skbuff.h> | 23 | #include <linux/skbuff.h> |
26 | #include <linux/netdevice.h> | 24 | #include <linux/netdevice.h> |
27 | #include <linux/etherdevice.h> | 25 | #include <linux/etherdevice.h> |
@@ -361,12 +359,12 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct | |||
361 | goto out; | 359 | goto out; |
362 | 360 | ||
363 | if (!arp) { | 361 | if (!arp) { |
364 | dprintk("Packet has no ARP data\n"); | 362 | pr_debug("Packet has no ARP data\n"); |
365 | goto out; | 363 | goto out; |
366 | } | 364 | } |
367 | 365 | ||
368 | if (skb->len < sizeof(struct arp_pkt)) { | 366 | if (skb->len < sizeof(struct arp_pkt)) { |
369 | dprintk("Packet is too small to be an ARP\n"); | 367 | pr_debug("Packet is too small to be an ARP\n"); |
370 | goto out; | 368 | goto out; |
371 | } | 369 | } |
372 | 370 | ||
@@ -376,7 +374,7 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct | |||
376 | bond_dev->name); | 374 | bond_dev->name); |
377 | bond = netdev_priv(bond_dev); | 375 | bond = netdev_priv(bond_dev); |
378 | rlb_update_entry_from_arp(bond, arp); | 376 | rlb_update_entry_from_arp(bond, arp); |
379 | dprintk("Server received an ARP Reply from client\n"); | 377 | pr_debug("Server received an ARP Reply from client\n"); |
380 | } | 378 | } |
381 | 379 | ||
382 | res = NET_RX_SUCCESS; | 380 | res = NET_RX_SUCCESS; |
@@ -730,7 +728,7 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond) | |||
730 | if (tx_slave) { | 728 | if (tx_slave) { |
731 | memcpy(arp->mac_src,tx_slave->dev->dev_addr, ETH_ALEN); | 729 | memcpy(arp->mac_src,tx_slave->dev->dev_addr, ETH_ALEN); |
732 | } | 730 | } |
733 | dprintk("Server sent ARP Reply packet\n"); | 731 | pr_debug("Server sent ARP Reply packet\n"); |
734 | } else if (arp->op_code == htons(ARPOP_REQUEST)) { | 732 | } else if (arp->op_code == htons(ARPOP_REQUEST)) { |
735 | /* Create an entry in the rx_hashtbl for this client as a | 733 | /* Create an entry in the rx_hashtbl for this client as a |
736 | * place holder. | 734 | * place holder. |
@@ -750,7 +748,7 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond) | |||
750 | * updated with their assigned mac. | 748 | * updated with their assigned mac. |
751 | */ | 749 | */ |
752 | rlb_req_update_subnet_clients(bond, arp->ip_src); | 750 | rlb_req_update_subnet_clients(bond, arp->ip_src); |
753 | dprintk("Server sent ARP Request packet\n"); | 751 | pr_debug("Server sent ARP Request packet\n"); |
754 | } | 752 | } |
755 | 753 | ||
756 | return tx_slave; | 754 | return tx_slave; |