Commit 598ed936 authored by laurent chavey's avatar laurent chavey Committed by David S. Miller

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: default avatarchavey <chavey@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b00fabb4
...@@ -43,7 +43,7 @@ static atomic_t dst_total = ATOMIC_INIT(0); ...@@ -43,7 +43,7 @@ static atomic_t dst_total = ATOMIC_INIT(0);
*/ */
static struct { static struct {
spinlock_t lock; spinlock_t lock;
struct dst_entry *list; struct dst_entry *list;
unsigned long timer_inc; unsigned long timer_inc;
unsigned long timer_expires; unsigned long timer_expires;
} dst_garbage = { } dst_garbage = {
...@@ -51,7 +51,7 @@ static struct { ...@@ -51,7 +51,7 @@ static struct {
.timer_inc = DST_GC_MAX, .timer_inc = DST_GC_MAX,
}; };
static void dst_gc_task(struct work_struct *work); static void dst_gc_task(struct work_struct *work);
static void ___dst_free(struct dst_entry * dst); static void ___dst_free(struct dst_entry *dst);
static DECLARE_DELAYED_WORK(dst_gc_work, dst_gc_task); static DECLARE_DELAYED_WORK(dst_gc_work, dst_gc_task);
...@@ -135,8 +135,8 @@ static void dst_gc_task(struct work_struct *work) ...@@ -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) ...@@ -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
} }
...@@ -162,9 +163,9 @@ int dst_discard(struct sk_buff *skb) ...@@ -162,9 +163,9 @@ int dst_discard(struct sk_buff *skb)
} }
EXPORT_SYMBOL(dst_discard); EXPORT_SYMBOL(dst_discard);
void * dst_alloc(struct dst_ops * ops) void *dst_alloc(struct dst_ops *ops)
{ {
struct dst_entry * dst; struct dst_entry *dst;
if (ops->gc && atomic_read(&ops->entries) > ops->gc_thresh) { if (ops->gc && atomic_read(&ops->entries) > ops->gc_thresh) {
if (ops->gc(ops)) if (ops->gc(ops))
...@@ -184,19 +185,20 @@ void * dst_alloc(struct dst_ops * ops) ...@@ -184,19 +185,20 @@ 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)
{ {
spin_lock_bh(&dst_garbage.lock); spin_lock_bh(&dst_garbage.lock);
___dst_free(dst); ___dst_free(dst);
...@@ -261,15 +263,16 @@ struct dst_entry *dst_destroy(struct dst_entry * dst) ...@@ -261,15 +263,16 @@ 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)
{ {
if (dst) { if (dst) {
int newrefcnt; int newrefcnt;
smp_mb__before_atomic_dec(); smp_mb__before_atomic_dec();
newrefcnt = atomic_dec_return(&dst->__refcnt); newrefcnt = atomic_dec_return(&dst->__refcnt);
WARN_ON(newrefcnt < 0); WARN_ON(newrefcnt < 0);
} }
} }
EXPORT_SYMBOL(dst_release); EXPORT_SYMBOL(dst_release);
...@@ -305,7 +308,8 @@ static inline void dst_ifdown(struct dst_entry *dst, struct net_device *dev, ...@@ -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 ...@@ -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) ...@@ -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);
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