leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/atm/mpoa_caches.c: checkpatch cleanups

Browse Source 
Convert #include <asm... to #include <linux...
Add printk argument verification to dprintk and ddprintk
Spacing cleanups
Mostly 80 column wrapped.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches 2010-01-26 11:40:10 +00:00 committed by David S. Miller
parent 5710044073
commit bee67d34b2
1 changed files with 88 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
net/atm/mpoa_caches.c
View File

@ -11,15 +11,17 @@
*/ */
#if 0 #if 0
#define dprintk printk /* debug */ #define dprintk(format, args...) printk(KERN_DEBUG format, ##args) /* debug */
#else #else
#define dprintk(format,args...) #define dprintk(format, args...) \
do { if (0) printk(KERN_DEBUG format, ##args); } while (0)
#endif #endif
#if 0 #if 0
#define ddprintk printk /* more debug */ #define ddprintk printk(KERN_DEBUG format, ##args) /* more debug */
#else #else
#define ddprintk(format,args...) #define ddprintk(format, args...) \
do { if (0) printk(KERN_DEBUG format, ##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,
@ -90,11 +92,12 @@ static in_cache_entry *in_cache_add_entry(__be32 dst_ip,
in_cache_entry *entry = kzalloc(sizeof(in_cache_entry), GFP_KERNEL); in_cache_entry *entry = kzalloc(sizeof(in_cache_entry), GFP_KERNEL);
if (entry == NULL) { if (entry == NULL) {
printk("mpoa: mpoa_caches.c: new_in_cache_entry: out of memory\n"); pr_info("mpoa: mpoa_caches.c: new_in_cache_entry: out of memory\n");
return NULL; return NULL;
} }
dprintk("mpoa: mpoa_caches.c: adding an ingress entry, ip = %pI4\n", &dst_ip); dprintk("mpoa: mpoa_caches.c: adding an ingress entry, ip = %pI4\n",
&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("mpoa: mpoa_caches.c: new_in_cache_entry: about to lock\n");
@ -135,7 +138,8 @@ static int cache_hit(in_cache_entry *entry, struct mpoa_client *mpc)
msg.content.in_info = entry->ctrl_info; msg.content.in_info = entry->ctrl_info;
memcpy(msg.MPS_ctrl, mpc->mps_ctrl_addr, ATM_ESA_LEN); memcpy(msg.MPS_ctrl, mpc->mps_ctrl_addr, ATM_ESA_LEN);
qos = atm_mpoa_search_qos(entry->ctrl_info.in_dst_ip); qos = atm_mpoa_search_qos(entry->ctrl_info.in_dst_ip);
if (qos != NULL) msg.qos = qos->qos; if (qos != NULL)
msg.qos = qos->qos;
msg_to_mpoad(&msg, mpc); msg_to_mpoad(&msg, mpc);
do_gettimeofday(&(entry->reply_wait)); do_gettimeofday(&(entry->reply_wait));
entry->entry_state = INGRESS_RESOLVING; entry->entry_state = INGRESS_RESOLVING;
@ -157,7 +161,8 @@ static int cache_hit(in_cache_entry *entry, struct mpoa_client *mpc)
memcpy(msg.MPS_ctrl, mpc->mps_ctrl_addr, ATM_ESA_LEN); memcpy(msg.MPS_ctrl, mpc->mps_ctrl_addr, ATM_ESA_LEN);
msg.content.in_info = entry->ctrl_info; msg.content.in_info = entry->ctrl_info;
qos = atm_mpoa_search_qos(entry->ctrl_info.in_dst_ip); qos = atm_mpoa_search_qos(entry->ctrl_info.in_dst_ip);
if (qos != NULL) msg.qos = qos->qos; if (qos != NULL)
msg.qos = qos->qos;
msg_to_mpoad(&msg, mpc); msg_to_mpoad(&msg, mpc);
do_gettimeofday(&(entry->reply_wait)); do_gettimeofday(&(entry->reply_wait));
} }
@ -202,7 +207,8 @@ static void in_cache_remove_entry(in_cache_entry *entry,
/* Check if the egress side still uses this VCC */ /* Check if the egress side still uses this VCC */
if (vcc != NULL) { if (vcc != NULL) {
eg_cache_entry *eg_entry = client->eg_ops->get_by_vcc(vcc, client); eg_cache_entry *eg_entry = client->eg_ops->get_by_vcc(vcc,
client);
if (eg_entry != NULL) { if (eg_entry != NULL) {
client->eg_ops->put(eg_entry); client->eg_ops->put(eg_entry);
return; return;
@ -213,7 +219,6 @@ static void in_cache_remove_entry(in_cache_entry *entry,
return; return;
} }
/* Call this every MPC-p2 seconds... Not exactly correct solution, /* Call this every MPC-p2 seconds... Not exactly correct solution,
but an easy one... */ but an easy one... */
static void clear_count_and_expired(struct mpoa_client *client) static void clear_count_and_expired(struct mpoa_client *client)
@ -256,15 +261,19 @@ static void check_resolving_entries(struct mpoa_client *client)
entry = client->in_cache; entry = client->in_cache;
while (entry != NULL) { while (entry != NULL) {
if (entry->entry_state == INGRESS_RESOLVING) { if (entry->entry_state == INGRESS_RESOLVING) {
if(now.tv_sec - entry->hold_down.tv_sec < client->parameters.mpc_p6){ if ((now.tv_sec - entry->hold_down.tv_sec) <
client->parameters.mpc_p6) {
entry = entry->next; /* Entry in hold down */ entry = entry->next; /* Entry in hold down */
continue; continue;
} }
if ((now.tv_sec - entry->reply_wait.tv_sec) > if ((now.tv_sec - entry->reply_wait.tv_sec) >
entry->retry_time) { entry->retry_time) {
entry->retry_time = MPC_C1 * (entry->retry_time); entry->retry_time = MPC_C1 * (entry->retry_time);
/*
* Retry time maximum exceeded,
* put entry in hold down.
*/
if (entry->retry_time > client->parameters.mpc_p5) { if (entry->retry_time > client->parameters.mpc_p5) {
/* Retry time maximum exceeded, put entry in hold down. */
do_gettimeofday(&(entry->hold_down)); do_gettimeofday(&(entry->hold_down));
entry->retry_time = client->parameters.mpc_p4; entry->retry_time = client->parameters.mpc_p4;
entry = entry->next; entry = entry->next;
@ -276,7 +285,8 @@ static void check_resolving_entries(struct mpoa_client *client)
memcpy(msg.MPS_ctrl, client->mps_ctrl_addr, ATM_ESA_LEN); memcpy(msg.MPS_ctrl, client->mps_ctrl_addr, ATM_ESA_LEN);
msg.content.in_info = entry->ctrl_info; msg.content.in_info = entry->ctrl_info;
qos = atm_mpoa_search_qos(entry->ctrl_info.in_dst_ip); qos = atm_mpoa_search_qos(entry->ctrl_info.in_dst_ip);
if (qos != NULL) msg.qos = qos->qos; if (qos != NULL)
msg.qos = qos->qos;
msg_to_mpoad(&msg, client); msg_to_mpoad(&msg, client);
do_gettimeofday(&(entry->reply_wait)); do_gettimeofday(&(entry->reply_wait));
} }
@ -300,7 +310,8 @@ static void refresh_entries(struct mpoa_client *client)
if (entry->entry_state == INGRESS_RESOLVED) { if (entry->entry_state == INGRESS_RESOLVED) {
if (!(entry->refresh_time)) if (!(entry->refresh_time))
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) > entry->refresh_time ){ if ((now.tv_sec - entry->reply_wait.tv_sec) >
entry->refresh_time) {
dprintk("mpoa: mpoa_caches.c: refreshing an entry.\n"); dprintk("mpoa: mpoa_caches.c: refreshing an entry.\n");
entry->entry_state = INGRESS_REFRESHING; entry->entry_state = INGRESS_REFRESHING;
@ -321,7 +332,8 @@ static void in_destroy_cache(struct mpoa_client *mpc)
return; return;
} }
static eg_cache_entry *eg_cache_get_by_cache_id(__be32 cache_id, struct mpoa_client *mpc) static eg_cache_entry *eg_cache_get_by_cache_id(__be32 cache_id,
struct mpoa_client *mpc)
{ {
eg_cache_entry *entry; eg_cache_entry *entry;
@ -362,7 +374,8 @@ static eg_cache_entry *eg_cache_get_by_tag(__be32 tag, struct mpoa_client *mpc)
} }
/* This can be called from any context since it saves CPU flags */ /* This can be called from any context since it saves CPU flags */
static eg_cache_entry *eg_cache_get_by_vcc(struct atm_vcc *vcc, struct mpoa_client *mpc) static eg_cache_entry *eg_cache_get_by_vcc(struct atm_vcc *vcc,
struct mpoa_client *mpc)
{ {
unsigned long flags; unsigned long flags;
eg_cache_entry *entry; eg_cache_entry *entry;
@ -382,7 +395,8 @@ static eg_cache_entry *eg_cache_get_by_vcc(struct atm_vcc *vcc, struct mpoa_clie
return NULL; return NULL;
} }
static eg_cache_entry *eg_cache_get_by_src_ip(__be32 ipaddr, struct mpoa_client *mpc) static eg_cache_entry *eg_cache_get_by_src_ip(__be32 ipaddr,
struct mpoa_client *mpc)
{ {
eg_cache_entry *entry; eg_cache_entry *entry;
@ -447,12 +461,13 @@ static void eg_cache_remove_entry(eg_cache_entry *entry,
return; return;
} }
static eg_cache_entry *eg_cache_add_entry(struct k_message *msg, struct mpoa_client *client) static eg_cache_entry *eg_cache_add_entry(struct k_message *msg,
struct mpoa_client *client)
{ {
eg_cache_entry *entry = kzalloc(sizeof(eg_cache_entry), GFP_KERNEL); eg_cache_entry *entry = kzalloc(sizeof(eg_cache_entry), GFP_KERNEL);
if (entry == NULL) { if (entry == NULL) {
printk("mpoa: mpoa_caches.c: new_eg_cache_entry: out of memory\n"); pr_info("out of memory\n");
return NULL; return NULL;
} }
@ -472,7 +487,8 @@ static eg_cache_entry *eg_cache_add_entry(struct k_message *msg, struct mpoa_cli
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 %lu\n", ntohl(entry->ctrl_info.cache_id)); dprintk("mpoa: mpoa_caches.c: new_eg_cache_entry cache_id %u\n",
ntohl(entry->ctrl_info.cache_id));
dprintk("mpoa: mpoa_caches.c: mps_ip = %pI4\n", dprintk("mpoa: mpoa_caches.c: mps_ip = %pI4\n",
&entry->ctrl_info.mps_ip); &entry->ctrl_info.mps_ip);
atomic_inc(&entry->use); atomic_inc(&entry->use);
@ -508,7 +524,8 @@ 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 = %lu.\n",ntohl(entry->ctrl_info.cache_id)); dprintk("mpoa: mpoa_caches.c: egress_cache: holding time expired, cache_id = %u.\n",
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);
} }
@ -530,7 +547,6 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
} }
static struct in_cache_ops ingress_ops = { static struct in_cache_ops ingress_ops = {
in_cache_add_entry, /* add_entry */ in_cache_add_entry, /* add_entry */
in_cache_get, /* get */ in_cache_get, /* get */