aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorlaurent chavey <chavey@google.com>2010-03-29 06:41:36 -0400
committerDavid S. Miller <davem@davemloft.net>2010-03-31 02:51:08 -0400
commit598ed9367a36ee1fd4ae3271a54a3547a33975a5 (patch)
treef711b52a6a5ad514d80379e26555899e96c70a2e /net
parentb00fabb4020d17bda4bea59507e09fadf573088d (diff)
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>
Diffstat (limited to 'net')
-rw-r--r--net/core/dst.c41
1 files changed, 20 insertions, 21 deletions
diff --git a/net/core/dst.c b/net/core/dst.c
index cb1b3488b739..2076d84203d1 100644
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -43,7 +43,7 @@ static atomic_t dst_total = ATOMIC_INIT(0);
43 */ 43 */
44static struct { 44static struct {
45 spinlock_t lock; 45 spinlock_t lock;
46 struct dst_entry *list; 46 struct dst_entry *list;
47 unsigned long timer_inc; 47 unsigned long timer_inc;
48 unsigned long timer_expires; 48 unsigned long timer_expires;
49} dst_garbage = { 49} dst_garbage = {
@@ -51,7 +51,7 @@ static struct {
51 .timer_inc = DST_GC_MAX, 51 .timer_inc = DST_GC_MAX,
52}; 52};
53static void dst_gc_task(struct work_struct *work); 53static void dst_gc_task(struct work_struct *work);
54static void ___dst_free(struct dst_entry * dst); 54static void ___dst_free(struct dst_entry *dst);
55 55
56static DECLARE_DELAYED_WORK(dst_gc_work, dst_gc_task); 56static DECLARE_DELAYED_WORK(dst_gc_work, dst_gc_task);
57 57
@@ -135,8 +135,8 @@ loop:
135 } 135 }
136 expires = dst_garbage.timer_expires; 136 expires = dst_garbage.timer_expires;
137 /* 137 /*
138 * if the next desired timer is more than 4 seconds in the future 138 * if the next desired timer is more than 4 seconds in the
139 * then round the timer to whole seconds 139 * future then round the timer to whole seconds
140 */ 140 */
141 if (expires > 4*HZ) 141 if (expires > 4*HZ)
142 expires = round_jiffies_relative(expires); 142 expires = round_jiffies_relative(expires);
@@ -151,7 +151,8 @@ loop:
151 " expires: %lu elapsed: %lu us\n", 151 " expires: %lu elapsed: %lu us\n",
152 atomic_read(&dst_total), delayed, work_performed, 152 atomic_read(&dst_total), delayed, work_performed,
153 expires, 153 expires,
154 elapsed.tv_sec * USEC_PER_SEC + elapsed.tv_nsec / NSEC_PER_USEC); 154 elapsed.tv_sec * USEC_PER_SEC +
155 elapsed.tv_nsec / NSEC_PER_USEC);
155#endif 156#endif
156} 157}
157 158
@@ -162,9 +163,9 @@ int dst_discard(struct sk_buff *skb)
162} 163}
163EXPORT_SYMBOL(dst_discard); 164EXPORT_SYMBOL(dst_discard);
164 165
165void * dst_alloc(struct dst_ops * ops) 166void *dst_alloc(struct dst_ops *ops)
166{ 167{
167 struct dst_entry * dst; 168 struct dst_entry *dst;
168 169
169 if (ops->gc && atomic_read(&ops->entries) > ops->gc_thresh) { 170 if (ops->gc && atomic_read(&ops->entries) > ops->gc_thresh) {
170 if (ops->gc(ops)) 171 if (ops->gc(ops))
@@ -184,19 +185,20 @@ void * dst_alloc(struct dst_ops * ops)
184 atomic_inc(&ops->entries); 185 atomic_inc(&ops->entries);
185 return dst; 186 return dst;
186} 187}
188EXPORT_SYMBOL(dst_alloc);
187 189
188static void ___dst_free(struct dst_entry * dst) 190static void ___dst_free(struct dst_entry *dst)
189{ 191{
190 /* The first case (dev==NULL) is required, when 192 /* The first case (dev==NULL) is required, when
191 protocol module is unloaded. 193 protocol module is unloaded.
192 */ 194 */
193 if (dst->dev == NULL || !(dst->dev->flags&IFF_UP)) { 195 if (dst->dev == NULL || !(dst->dev->flags&IFF_UP))
194 dst->input = dst->output = dst_discard; 196 dst->input = dst->output = dst_discard;
195 }
196 dst->obsolete = 2; 197 dst->obsolete = 2;
197} 198}
199EXPORT_SYMBOL(__dst_free);
198 200
199void __dst_free(struct dst_entry * dst) 201void __dst_free(struct dst_entry *dst)
200{ 202{
201 spin_lock_bh(&dst_garbage.lock); 203 spin_lock_bh(&dst_garbage.lock);
202 ___dst_free(dst); 204 ___dst_free(dst);
@@ -261,15 +263,16 @@ again:
261 } 263 }
262 return NULL; 264 return NULL;
263} 265}
266EXPORT_SYMBOL(dst_destroy);
264 267
265void dst_release(struct dst_entry *dst) 268void dst_release(struct dst_entry *dst)
266{ 269{
267 if (dst) { 270 if (dst) {
268 int newrefcnt; 271 int newrefcnt;
269 272
270 smp_mb__before_atomic_dec(); 273 smp_mb__before_atomic_dec();
271 newrefcnt = atomic_dec_return(&dst->__refcnt); 274 newrefcnt = atomic_dec_return(&dst->__refcnt);
272 WARN_ON(newrefcnt < 0); 275 WARN_ON(newrefcnt < 0);
273 } 276 }
274} 277}
275EXPORT_SYMBOL(dst_release); 278EXPORT_SYMBOL(dst_release);
@@ -305,7 +308,8 @@ static inline void dst_ifdown(struct dst_entry *dst, struct net_device *dev,
305 } 308 }
306} 309}
307 310
308static int dst_dev_event(struct notifier_block *this, unsigned long event, void *ptr) 311static int dst_dev_event(struct notifier_block *this, unsigned long event,
312 void *ptr)
309{ 313{
310 struct net_device *dev = ptr; 314 struct net_device *dev = ptr;
311 struct dst_entry *dst, *last = NULL; 315 struct dst_entry *dst, *last = NULL;
@@ -328,9 +332,8 @@ static int dst_dev_event(struct notifier_block *this, unsigned long event, void
328 last->next = dst; 332 last->next = dst;
329 else 333 else
330 dst_busy_list = dst; 334 dst_busy_list = dst;
331 for (; dst; dst = dst->next) { 335 for (; dst; dst = dst->next)
332 dst_ifdown(dst, dev, event != NETDEV_DOWN); 336 dst_ifdown(dst, dev, event != NETDEV_DOWN);
333 }
334 mutex_unlock(&dst_gc_mutex); 337 mutex_unlock(&dst_gc_mutex);
335 break; 338 break;
336 } 339 }
@@ -345,7 +348,3 @@ void __init dst_init(void)
345{ 348{
346 register_netdevice_notifier(&dst_dev_notifier); 349 register_netdevice_notifier(&dst_dev_notifier);
347} 350}
348
349EXPORT_SYMBOL(__dst_free);
350EXPORT_SYMBOL(dst_alloc);
351EXPORT_SYMBOL(dst_destroy);