openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix net/core/dst.c coding style error and warnings 

Fix coding style errors and warnings output while running checkpatch.pl
on the file net/core/dst.c.

Signed-off-by: chavey <chavey@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
laurent chavey 2010-03-29 10:41:36 +00:00 committed by David S. Miller
parent b00fabb402
commit 598ed9367a
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
net/core/dst.c
View File

@ -135,8 +135,8 @@ static void dst_gc_task(struct work_struct *work)
} }
expires = dst_garbage.timer_expires; expires = dst_garbage.timer_expires;
/* /*
* if the next desired timer is more than 4 seconds in the future * if the next desired timer is more than 4 seconds in the
* then round the timer to whole seconds * future then round the timer to whole seconds
*/ */
if (expires > 4*HZ) if (expires > 4*HZ)
expires = round_jiffies_relative(expires); expires = round_jiffies_relative(expires);
@ -151,7 +151,8 @@ static void dst_gc_task(struct work_struct *work)
" expires: %lu elapsed: %lu us\n", " expires: %lu elapsed: %lu us\n",
atomic_read(&dst_total), delayed, work_performed, atomic_read(&dst_total), delayed, work_performed,
expires, expires,
elapsed.tv_sec * USEC_PER_SEC + elapsed.tv_nsec / NSEC_PER_USEC); elapsed.tv_sec * USEC_PER_SEC +
elapsed.tv_nsec / NSEC_PER_USEC);
#endif #endif
} }
@ -184,17 +185,18 @@ void * dst_alloc(struct dst_ops * ops)
atomic_inc(&ops->entries); atomic_inc(&ops->entries);
return dst; return dst;
} }
EXPORT_SYMBOL(dst_alloc);
static void ___dst_free(struct dst_entry *dst) static void ___dst_free(struct dst_entry *dst)
{ {
/* The first case (dev==NULL) is required, when /* The first case (dev==NULL) is required, when
protocol module is unloaded. protocol module is unloaded.
*/ */
if (dst->dev == NULL || !(dst->dev->flags&IFF_UP)) { if (dst->dev == NULL || !(dst->dev->flags&IFF_UP))
dst->input = dst->output = dst_discard; dst->input = dst->output = dst_discard;
}
dst->obsolete = 2; dst->obsolete = 2;
} }
EXPORT_SYMBOL(__dst_free);
void __dst_free(struct dst_entry *dst) void __dst_free(struct dst_entry *dst)
{ {
@ -261,6 +263,7 @@ struct dst_entry *dst_destroy(struct dst_entry * dst)
} }
return NULL; return NULL;
} }
EXPORT_SYMBOL(dst_destroy);
void dst_release(struct dst_entry *dst) void dst_release(struct dst_entry *dst)
{ {
@ -305,7 +308,8 @@ static inline void dst_ifdown(struct dst_entry *dst, struct net_device *dev,
} }
} }
static int dst_dev_event(struct notifier_block *this, unsigned long event, void *ptr) static int dst_dev_event(struct notifier_block *this, unsigned long event,
void *ptr)
{ {
struct net_device *dev = ptr; struct net_device *dev = ptr;
struct dst_entry *dst, *last = NULL; struct dst_entry *dst, *last = NULL;
@ -328,9 +332,8 @@ static int dst_dev_event(struct notifier_block *this, unsigned long event, void
last->next = dst; last->next = dst;
else else
dst_busy_list = dst; dst_busy_list = dst;
for (; dst; dst = dst->next) { for (; dst; dst = dst->next)
dst_ifdown(dst, dev, event != NETDEV_DOWN); dst_ifdown(dst, dev, event != NETDEV_DOWN);
}
mutex_unlock(&dst_gc_mutex); mutex_unlock(&dst_gc_mutex);
break; break;
} }
@ -345,7 +348,3 @@ void __init dst_init(void)
{ {
register_netdevice_notifier(&dst_dev_notifier); register_netdevice_notifier(&dst_dev_notifier);
} }
EXPORT_SYMBOL(__dst_free);
EXPORT_SYMBOL(dst_alloc);
EXPORT_SYMBOL(dst_destroy);