Skip to content

L
linux
Commit b50c2ea7 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files
Options

net/atm: Cleanup dprint/ddprintk #defines and uses 

Move "mpoa:%s: ", __func__/__FILE__ to #defines
Remove mpoa __func__/__FILE__ from dprintk uses
Add and use #define dprint_cont where appropriate
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b4c84ec0
Expand all Show whitespace changes
Inline Side-by-side
Showing with 124 additions and 107 deletions
net/atm/mpc.c
View file @ b50c2ea7
This diff is collapsed.
net/atm/mpoa_caches.c
View file @ b50c2ea7
...@@ -11,17 +11,23 @@ ...@@ -11,17 +11,23 @@
*/ */
#if 0 #if 0
#define dprintk(format, args...) printk(KERN_DEBUG format, ##args) /* debug */ #define dprintk(format, args...) \
printk(KERN_DEBUG "mpoa:%s: " format, __FILE__, ##args) /* debug */
#else #else
#define dprintk(format, args...) \ #define dprintk(format, args...) \
do { if (0) printk(KERN_DEBUG format, ##args); } while (0) do { if (0) \
printk(KERN_DEBUG "mpoa:%s: " format, __FILE__, ##args);\
} while (0)
#endif #endif
#if 0 #if 0
#define ddprintk printk(KERN_DEBUG format, ##args) /* more debug */ #define ddprintk(format, args...) \
printk(KERN_DEBUG "mpoa:%s: " format, __FILE__, ##args) /* debug */
#else #else
#define ddprintk(format, args...) \ #define ddprintk(format, args...) \
do { if (0) printk(KERN_DEBUG format, ##args); } while (0) do { if (0) \
printk(KERN_DEBUG "mpoa:%s: " format, __FILE__, ##args);\
} while (0)
#endif #endif
static in_cache_entry *in_cache_get(__be32 dst_ip, static in_cache_entry *in_cache_get(__be32 dst_ip,
...@@ -96,11 +102,10 @@ static in_cache_entry *in_cache_add_entry(__be32 dst_ip, ...@@ -96,11 +102,10 @@ static in_cache_entry *in_cache_add_entry(__be32 dst_ip,
return NULL; return NULL;
} }
dprintk("mpoa: mpoa_caches.c: adding an ingress entry, ip = %pI4\n", dprintk("adding an ingress entry, ip = %pI4\n", &dst_ip);
&dst_ip);
atomic_set(&entry->use, 1); atomic_set(&entry->use, 1);
dprintk("mpoa: mpoa_caches.c: new_in_cache_entry: about to lock\n"); dprintk("new_in_cache_entry: about to lock\n");
write_lock_bh(&client->ingress_lock); write_lock_bh(&client->ingress_lock);
entry->next = client->in_cache; entry->next = client->in_cache;
entry->prev = NULL; entry->prev = NULL;
...@@ -118,7 +123,7 @@ static in_cache_entry *in_cache_add_entry(__be32 dst_ip, ...@@ -118,7 +123,7 @@ static in_cache_entry *in_cache_add_entry(__be32 dst_ip,
atomic_inc(&entry->use); atomic_inc(&entry->use);
write_unlock_bh(&client->ingress_lock); write_unlock_bh(&client->ingress_lock);
dprintk("mpoa: mpoa_caches.c: new_in_cache_entry: unlocked\n"); dprintk("new_in_cache_entry: unlocked\n");
return entry; return entry;
} }
...@@ -154,7 +159,7 @@ static int cache_hit(in_cache_entry *entry, struct mpoa_client *mpc) ...@@ -154,7 +159,7 @@ static int cache_hit(in_cache_entry *entry, struct mpoa_client *mpc)
if (entry->count > mpc->parameters.mpc_p1 && if (entry->count > mpc->parameters.mpc_p1 &&
entry->entry_state == INGRESS_INVALID) { entry->entry_state == INGRESS_INVALID) {
dprintk("mpoa: (%s) mpoa_caches.c: threshold exceeded for ip %pI4, sending MPOA res req\n", dprintk("(%s) threshold exceeded for ip %pI4, sending MPOA res req\n",
mpc->dev->name, &entry->ctrl_info.in_dst_ip); mpc->dev->name, &entry->ctrl_info.in_dst_ip);
entry->entry_state = INGRESS_RESOLVING; entry->entry_state = INGRESS_RESOLVING;
msg.type = SND_MPOA_RES_RQST; msg.type = SND_MPOA_RES_RQST;
...@@ -190,7 +195,7 @@ static void in_cache_remove_entry(in_cache_entry *entry, ...@@ -190,7 +195,7 @@ static void in_cache_remove_entry(in_cache_entry *entry,
struct k_message msg; struct k_message msg;
vcc = entry->shortcut; vcc = entry->shortcut;
dprintk("mpoa: mpoa_caches.c: removing an ingress entry, ip = %pI4\n", dprintk("removing an ingress entry, ip = %pI4\n",
&entry->ctrl_info.in_dst_ip); &entry->ctrl_info.in_dst_ip);
if (entry->prev != NULL) if (entry->prev != NULL)
...@@ -235,7 +240,7 @@ static void clear_count_and_expired(struct mpoa_client *client) ...@@ -235,7 +240,7 @@ static void clear_count_and_expired(struct mpoa_client *client)
next_entry = entry->next; next_entry = entry->next;
if ((now.tv_sec - entry->tv.tv_sec) if ((now.tv_sec - entry->tv.tv_sec)
> entry->ctrl_info.holding_time) { > entry->ctrl_info.holding_time) {
dprintk("mpoa: mpoa_caches.c: holding time expired, ip = %pI4\n", dprintk("holding time expired, ip = %pI4\n",
&entry->ctrl_info.in_dst_ip); &entry->ctrl_info.in_dst_ip);
client->in_ops->remove_entry(entry, client); client->in_ops->remove_entry(entry, client);
} }
...@@ -302,7 +307,7 @@ static void refresh_entries(struct mpoa_client *client) ...@@ -302,7 +307,7 @@ static void refresh_entries(struct mpoa_client *client)
struct timeval now; struct timeval now;
struct in_cache_entry *entry = client->in_cache; struct in_cache_entry *entry = client->in_cache;
ddprintk("mpoa: mpoa_caches.c: refresh_entries\n"); ddprintk("refresh_entries\n");
do_gettimeofday(&now); do_gettimeofday(&now);
read_lock_bh(&client->ingress_lock); read_lock_bh(&client->ingress_lock);
...@@ -312,7 +317,7 @@ static void refresh_entries(struct mpoa_client *client) ...@@ -312,7 +317,7 @@ static void refresh_entries(struct mpoa_client *client)
entry->refresh_time = (2 * (entry->ctrl_info.holding_time))/3; entry->refresh_time = (2 * (entry->ctrl_info.holding_time))/3;
if ((now.tv_sec - entry->reply_wait.tv_sec) > if ((now.tv_sec - entry->reply_wait.tv_sec) >
entry->refresh_time) { entry->refresh_time) {
dprintk("mpoa: mpoa_caches.c: refreshing an entry.\n"); dprintk("refreshing an entry.\n");
entry->entry_state = INGRESS_REFRESHING; entry->entry_state = INGRESS_REFRESHING;
} }
...@@ -435,7 +440,7 @@ static void eg_cache_remove_entry(eg_cache_entry *entry, ...@@ -435,7 +440,7 @@ static void eg_cache_remove_entry(eg_cache_entry *entry,
struct k_message msg; struct k_message msg;
vcc = entry->shortcut; vcc = entry->shortcut;
dprintk("mpoa: mpoa_caches.c: removing an egress entry.\n"); dprintk("removing an egress entry.\n");
if (entry->prev != NULL) if (entry->prev != NULL)
entry->prev->next = entry->next; entry->prev->next = entry->next;
else else
...@@ -471,11 +476,11 @@ static eg_cache_entry *eg_cache_add_entry(struct k_message *msg, ...@@ -471,11 +476,11 @@ static eg_cache_entry *eg_cache_add_entry(struct k_message *msg,
return NULL; return NULL;
} }
dprintk("mpoa: mpoa_caches.c: adding an egress entry, ip = %pI4, this should be our IP\n", dprintk("adding an egress entry, ip = %pI4, this should be our IP\n",
&msg->content.eg_info.eg_dst_ip); &msg->content.eg_info.eg_dst_ip);
atomic_set(&entry->use, 1); atomic_set(&entry->use, 1);
dprintk("mpoa: mpoa_caches.c: new_eg_cache_entry: about to lock\n"); dprintk("new_eg_cache_entry: about to lock\n");
write_lock_irq(&client->egress_lock); write_lock_irq(&client->egress_lock);
entry->next = client->eg_cache; entry->next = client->eg_cache;
entry->prev = NULL; entry->prev = NULL;
...@@ -487,14 +492,13 @@ static eg_cache_entry *eg_cache_add_entry(struct k_message *msg, ...@@ -487,14 +492,13 @@ static eg_cache_entry *eg_cache_add_entry(struct k_message *msg,
entry->ctrl_info = msg->content.eg_info; entry->ctrl_info = msg->content.eg_info;
do_gettimeofday(&(entry->tv)); do_gettimeofday(&(entry->tv));
entry->entry_state = EGRESS_RESOLVED; entry->entry_state = EGRESS_RESOLVED;
dprintk("mpoa: mpoa_caches.c: new_eg_cache_entry cache_id %u\n", dprintk("new_eg_cache_entry cache_id %u\n",
ntohl(entry->ctrl_info.cache_id)); ntohl(entry->ctrl_info.cache_id));
dprintk("mpoa: mpoa_caches.c: mps_ip = %pI4\n", dprintk("mps_ip = %pI4\n", &entry->ctrl_info.mps_ip);
&entry->ctrl_info.mps_ip);
atomic_inc(&entry->use); atomic_inc(&entry->use);
write_unlock_irq(&client->egress_lock); write_unlock_irq(&client->egress_lock);
dprintk("mpoa: mpoa_caches.c: new_eg_cache_entry: unlocked\n"); dprintk("new_eg_cache_entry: unlocked\n");
return entry; return entry;
} }
...@@ -524,7 +528,7 @@ static void clear_expired(struct mpoa_client *client) ...@@ -524,7 +528,7 @@ static void clear_expired(struct mpoa_client *client)
> entry->ctrl_info.holding_time) { > entry->ctrl_info.holding_time) {
msg.type = SND_EGRESS_PURGE; msg.type = SND_EGRESS_PURGE;
msg.content.eg_info = entry->ctrl_info; msg.content.eg_info = entry->ctrl_info;
dprintk("mpoa: mpoa_caches.c: egress_cache: holding time expired, cache_id = %u.\n", dprintk("egress_cache: holding time expired, cache_id = %u.\n",
ntohl(entry->ctrl_info.cache_id)); ntohl(entry->ctrl_info.cache_id));
msg_to_mpoad(&msg, client); msg_to_mpoad(&msg, client);
client->eg_ops->remove_entry(entry, client); client->eg_ops->remove_entry(entry, client);
......
net/atm/mpoa_proc.c
View file @ b50c2ea7
...@@ -21,10 +21,23 @@ ...@@ -21,10 +21,23 @@
*/ */
#if 1 #if 1
#define dprintk(format, args...) printk(KERN_DEBUG format, ##args) /* debug */ #define dprintk(format, args...) \
printk(KERN_DEBUG "mpoa:%s: " format, __FILE__, ##args) /* debug */
#else #else
#define dprintk(format, args...) \ #define dprintk(format, args...) \
do { if (0) printk(KERN_DEBUG format, ##args); } while (0) do { if (0) \
printk(KERN_DEBUG "mpoa:%s: " format, __FILE__, ##args);\
} while (0)
#endif
#if 0
#define ddprintk(format, args...) \
printk(KERN_DEBUG "mpoa:%s: " format, __FILE__, ##args) /* debug */
#else
#define ddprintk(format, args...) \
do { if (0) \
printk(KERN_DEBUG "mpoa:%s: " format, __FILE__, ##args);\
} while (0)
#endif #endif
#define STAT_FILE_NAME "mpc" /* Our statistic file's name */ #define STAT_FILE_NAME "mpc" /* Our statistic file's name */
...@@ -258,12 +271,9 @@ static int parse_qos(const char *buff) ...@@ -258,12 +271,9 @@ static int parse_qos(const char *buff)
qos.rxtp.max_pcr = rx_pcr; qos.rxtp.max_pcr = rx_pcr;
qos.rxtp.max_sdu = rx_sdu; qos.rxtp.max_sdu = rx_sdu;
qos.aal = ATM_AAL5; qos.aal = ATM_AAL5;
dprintk("mpoa: mpoa_proc.c: parse_qos(): setting qos paramameters to tx=%d,%d rx=%d,%d\n", dprintk("parse_qos(): setting qos paramameters to tx=%d,%d rx=%d,%d\n",
qos.txtp.max_pcr, qos.txtp.max_pcr, qos.txtp.max_sdu,
qos.txtp.max_sdu, qos.rxtp.max_pcr, qos.rxtp.max_sdu);
qos.rxtp.max_pcr,
qos.rxtp.max_sdu
);
atm_mpoa_add_qos(ipaddr, &qos); atm_mpoa_add_qos(ipaddr, &qos);
return 1; return 1;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7