Commit 5a03cdb7 authored by Holger Eitzenberger's avatar Holger Eitzenberger Committed by David S. Miller

bonding: use pr_debug instead of own macros

Use pr_debug() instead of own macros.
Signed-off-by: default avatarHolger Eitzenberger <holger@eitzenberger.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ef65583d
This diff is collapsed.
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
* *
*/ */
//#define BONDING_DEBUG 1
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
...@@ -361,12 +359,12 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct ...@@ -361,12 +359,12 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct
goto out; goto out;
if (!arp) { if (!arp) {
dprintk("Packet has no ARP data\n"); pr_debug("Packet has no ARP data\n");
goto out; goto out;
} }
if (skb->len < sizeof(struct arp_pkt)) { if (skb->len < sizeof(struct arp_pkt)) {
dprintk("Packet is too small to be an ARP\n"); pr_debug("Packet is too small to be an ARP\n");
goto out; goto out;
} }
...@@ -376,7 +374,7 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct ...@@ -376,7 +374,7 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct
bond_dev->name); bond_dev->name);
bond = netdev_priv(bond_dev); bond = netdev_priv(bond_dev);
rlb_update_entry_from_arp(bond, arp); rlb_update_entry_from_arp(bond, arp);
dprintk("Server received an ARP Reply from client\n"); pr_debug("Server received an ARP Reply from client\n");
} }
res = NET_RX_SUCCESS; res = NET_RX_SUCCESS;
...@@ -730,7 +728,7 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond) ...@@ -730,7 +728,7 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond)
if (tx_slave) { if (tx_slave) {
memcpy(arp->mac_src,tx_slave->dev->dev_addr, ETH_ALEN); memcpy(arp->mac_src,tx_slave->dev->dev_addr, ETH_ALEN);
} }
dprintk("Server sent ARP Reply packet\n"); pr_debug("Server sent ARP Reply packet\n");
} else if (arp->op_code == htons(ARPOP_REQUEST)) { } else if (arp->op_code == htons(ARPOP_REQUEST)) {
/* Create an entry in the rx_hashtbl for this client as a /* Create an entry in the rx_hashtbl for this client as a
* place holder. * place holder.
...@@ -750,7 +748,7 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond) ...@@ -750,7 +748,7 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond)
* updated with their assigned mac. * updated with their assigned mac.
*/ */
rlb_req_update_subnet_clients(bond, arp->ip_src); rlb_req_update_subnet_clients(bond, arp->ip_src);
dprintk("Server sent ARP Request packet\n"); pr_debug("Server sent ARP Request packet\n");
} }
return tx_slave; return tx_slave;
......
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
* *
*/ */
//#define BONDING_DEBUG 1
#include <linux/types.h> #include <linux/types.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <net/ipv6.h> #include <net/ipv6.h>
...@@ -74,7 +72,7 @@ static void bond_na_send(struct net_device *slave_dev, ...@@ -74,7 +72,7 @@ static void bond_na_send(struct net_device *slave_dev,
addrconf_addr_solict_mult(daddr, &mcaddr); addrconf_addr_solict_mult(daddr, &mcaddr);
dprintk("ipv6 na on slave %s: dest %pI6, src %pI6\n", pr_debug("ipv6 na on slave %s: dest %pI6, src %pI6\n",
slave_dev->name, &mcaddr, daddr); slave_dev->name, &mcaddr, daddr);
skb = ndisc_build_skb(slave_dev, &mcaddr, daddr, &icmp6h, daddr, skb = ndisc_build_skb(slave_dev, &mcaddr, daddr, &icmp6h, daddr,
...@@ -110,7 +108,7 @@ void bond_send_unsolicited_na(struct bonding *bond) ...@@ -110,7 +108,7 @@ void bond_send_unsolicited_na(struct bonding *bond)
struct inet6_dev *idev; struct inet6_dev *idev;
int is_router; 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"); slave ? slave->dev->name : "NULL");
if (!slave || !bond->send_unsol_na || if (!slave || !bond->send_unsol_na ||
......
This diff is collapsed.
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include <net/net_namespace.h> #include <net/net_namespace.h>
/* #define BONDING_DEBUG 1 */
#include "bonding.h" #include "bonding.h"
#define to_dev(obj) container_of(obj,struct device,kobj) #define to_dev(obj) container_of(obj,struct device,kobj)
#define to_bond(cd) ((struct bonding *)(netdev_priv(to_net_dev(cd)))) #define to_bond(cd) ((struct bonding *)(netdev_priv(to_net_dev(cd))))
......
...@@ -32,14 +32,6 @@ ...@@ -32,14 +32,6 @@
extern struct list_head bond_dev_list; extern struct list_head bond_dev_list;
#ifdef BONDING_DEBUG
#define dprintk(fmt, args...) \
printk(KERN_DEBUG \
DRV_NAME ": %s() %d: " fmt, __func__, __LINE__ , ## args )
#else
#define dprintk(fmt, args...)
#endif /* BONDING_DEBUG */
#define IS_UP(dev) \ #define IS_UP(dev) \
((((dev)->flags & IFF_UP) == IFF_UP) && \ ((((dev)->flags & IFF_UP) == IFF_UP) && \
netif_running(dev) && \ netif_running(dev) && \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment