aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2008-01-23 01:10:23 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:11:07 -0500
commit62e3ba1b558e5f393ef746880613fb8222e64d03 (patch)
tree159c218ad38daef676b2cbc5a00e6b83a04cc16d
parentf206351a50ea86250fabea96b9af8d8f8fc02603 (diff)
[NET_SCHED]: Move EXPORT_SYMBOL next to exported symbol
Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/sched/act_api.c9
-rw-r--r--net/sched/ematch.c11
-rw-r--r--net/sched/sch_api.c9
-rw-r--r--net/sched/sch_fifo.c3
-rw-r--r--net/sched/sch_generic.c17
5 files changed, 22 insertions, 27 deletions
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 81506474a4f7..3825508fdcd1 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -263,6 +263,7 @@ int tcf_register_action(struct tc_action_ops *act)
263 write_unlock(&act_mod_lock); 263 write_unlock(&act_mod_lock);
264 return 0; 264 return 0;
265} 265}
266EXPORT_SYMBOL(tcf_register_action);
266 267
267int tcf_unregister_action(struct tc_action_ops *act) 268int tcf_unregister_action(struct tc_action_ops *act)
268{ 269{
@@ -281,6 +282,7 @@ int tcf_unregister_action(struct tc_action_ops *act)
281 write_unlock(&act_mod_lock); 282 write_unlock(&act_mod_lock);
282 return err; 283 return err;
283} 284}
285EXPORT_SYMBOL(tcf_unregister_action);
284 286
285/* lookup by name */ 287/* lookup by name */
286static struct tc_action_ops *tc_lookup_action_n(char *kind) 288static struct tc_action_ops *tc_lookup_action_n(char *kind)
@@ -377,6 +379,7 @@ repeat:
377exec_done: 379exec_done:
378 return ret; 380 return ret;
379} 381}
382EXPORT_SYMBOL(tcf_action_exec);
380 383
381void tcf_action_destroy(struct tc_action *act, int bind) 384void tcf_action_destroy(struct tc_action *act, int bind)
382{ 385{
@@ -430,6 +433,7 @@ rtattr_failure:
430 nlmsg_trim(skb, b); 433 nlmsg_trim(skb, b);
431 return -1; 434 return -1;
432} 435}
436EXPORT_SYMBOL(tcf_action_dump_1);
433 437
434int 438int
435tcf_action_dump(struct sk_buff *skb, struct tc_action *act, int bind, int ref) 439tcf_action_dump(struct sk_buff *skb, struct tc_action *act, int bind, int ref)
@@ -1077,8 +1081,3 @@ static int __init tc_action_init(void)
1077} 1081}
1078 1082
1079subsys_initcall(tc_action_init); 1083subsys_initcall(tc_action_init);
1080
1081EXPORT_SYMBOL(tcf_register_action);
1082EXPORT_SYMBOL(tcf_unregister_action);
1083EXPORT_SYMBOL(tcf_action_exec);
1084EXPORT_SYMBOL(tcf_action_dump_1);
diff --git a/net/sched/ematch.c b/net/sched/ematch.c
index f3a104e323bd..27941cfc0ab5 100644
--- a/net/sched/ematch.c
+++ b/net/sched/ematch.c
@@ -141,6 +141,7 @@ errout:
141 write_unlock(&ematch_mod_lock); 141 write_unlock(&ematch_mod_lock);
142 return err; 142 return err;
143} 143}
144EXPORT_SYMBOL(tcf_em_register);
144 145
145/** 146/**
146 * tcf_em_unregister - unregster and extended match 147 * tcf_em_unregister - unregster and extended match
@@ -171,6 +172,7 @@ out:
171 write_unlock(&ematch_mod_lock); 172 write_unlock(&ematch_mod_lock);
172 return err; 173 return err;
173} 174}
175EXPORT_SYMBOL(tcf_em_unregister);
174 176
175static inline struct tcf_ematch * tcf_em_get_match(struct tcf_ematch_tree *tree, 177static inline struct tcf_ematch * tcf_em_get_match(struct tcf_ematch_tree *tree,
176 int index) 178 int index)
@@ -380,6 +382,7 @@ errout_abort:
380 tcf_em_tree_destroy(tp, tree); 382 tcf_em_tree_destroy(tp, tree);
381 return err; 383 return err;
382} 384}
385EXPORT_SYMBOL(tcf_em_tree_validate);
383 386
384/** 387/**
385 * tcf_em_tree_destroy - destroy an ematch tree 388 * tcf_em_tree_destroy - destroy an ematch tree
@@ -413,6 +416,7 @@ void tcf_em_tree_destroy(struct tcf_proto *tp, struct tcf_ematch_tree *tree)
413 tree->hdr.nmatches = 0; 416 tree->hdr.nmatches = 0;
414 kfree(tree->matches); 417 kfree(tree->matches);
415} 418}
419EXPORT_SYMBOL(tcf_em_tree_destroy);
416 420
417/** 421/**
418 * tcf_em_tree_dump - dump ematch tree into a rtnl message 422 * tcf_em_tree_dump - dump ematch tree into a rtnl message
@@ -472,6 +476,7 @@ int tcf_em_tree_dump(struct sk_buff *skb, struct tcf_ematch_tree *tree, int tlv)
472rtattr_failure: 476rtattr_failure:
473 return -1; 477 return -1;
474} 478}
479EXPORT_SYMBOL(tcf_em_tree_dump);
475 480
476static inline int tcf_em_match(struct sk_buff *skb, struct tcf_ematch *em, 481static inline int tcf_em_match(struct sk_buff *skb, struct tcf_ematch *em,
477 struct tcf_pkt_info *info) 482 struct tcf_pkt_info *info)
@@ -529,10 +534,4 @@ stack_overflow:
529 printk("Local stack overflow, increase NET_EMATCH_STACK\n"); 534 printk("Local stack overflow, increase NET_EMATCH_STACK\n");
530 return -1; 535 return -1;
531} 536}
532
533EXPORT_SYMBOL(tcf_em_register);
534EXPORT_SYMBOL(tcf_em_unregister);
535EXPORT_SYMBOL(tcf_em_tree_validate);
536EXPORT_SYMBOL(tcf_em_tree_destroy);
537EXPORT_SYMBOL(tcf_em_tree_dump);
538EXPORT_SYMBOL(__tcf_em_tree_match); 537EXPORT_SYMBOL(__tcf_em_tree_match);
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 273c628be054..dc89a9343f30 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -158,6 +158,7 @@ out:
158 write_unlock(&qdisc_mod_lock); 158 write_unlock(&qdisc_mod_lock);
159 return rc; 159 return rc;
160} 160}
161EXPORT_SYMBOL(register_qdisc);
161 162
162int unregister_qdisc(struct Qdisc_ops *qops) 163int unregister_qdisc(struct Qdisc_ops *qops)
163{ 164{
@@ -176,6 +177,7 @@ int unregister_qdisc(struct Qdisc_ops *qops)
176 write_unlock(&qdisc_mod_lock); 177 write_unlock(&qdisc_mod_lock);
177 return err; 178 return err;
178} 179}
180EXPORT_SYMBOL(unregister_qdisc);
179 181
180/* We know handle. Find qdisc among all qdisc's attached to device 182/* We know handle. Find qdisc among all qdisc's attached to device
181 (root qdisc, all its children, children of children etc.) 183 (root qdisc, all its children, children of children etc.)
@@ -255,6 +257,7 @@ struct qdisc_rate_table *qdisc_get_rtab(struct tc_ratespec *r, struct rtattr *ta
255 } 257 }
256 return rtab; 258 return rtab;
257} 259}
260EXPORT_SYMBOL(qdisc_get_rtab);
258 261
259void qdisc_put_rtab(struct qdisc_rate_table *tab) 262void qdisc_put_rtab(struct qdisc_rate_table *tab)
260{ 263{
@@ -271,6 +274,7 @@ void qdisc_put_rtab(struct qdisc_rate_table *tab)
271 } 274 }
272 } 275 }
273} 276}
277EXPORT_SYMBOL(qdisc_put_rtab);
274 278
275static enum hrtimer_restart qdisc_watchdog(struct hrtimer *timer) 279static enum hrtimer_restart qdisc_watchdog(struct hrtimer *timer)
276{ 280{
@@ -1289,8 +1293,3 @@ static int __init pktsched_init(void)
1289} 1293}
1290 1294
1291subsys_initcall(pktsched_init); 1295subsys_initcall(pktsched_init);
1292
1293EXPORT_SYMBOL(qdisc_get_rtab);
1294EXPORT_SYMBOL(qdisc_put_rtab);
1295EXPORT_SYMBOL(register_qdisc);
1296EXPORT_SYMBOL(unregister_qdisc);
diff --git a/net/sched/sch_fifo.c b/net/sched/sch_fifo.c
index d71dbfc790c0..fd0591903c8a 100644
--- a/net/sched/sch_fifo.c
+++ b/net/sched/sch_fifo.c
@@ -91,6 +91,7 @@ struct Qdisc_ops pfifo_qdisc_ops __read_mostly = {
91 .dump = fifo_dump, 91 .dump = fifo_dump,
92 .owner = THIS_MODULE, 92 .owner = THIS_MODULE,
93}; 93};
94EXPORT_SYMBOL(pfifo_qdisc_ops);
94 95
95struct Qdisc_ops bfifo_qdisc_ops __read_mostly = { 96struct Qdisc_ops bfifo_qdisc_ops __read_mostly = {
96 .id = "bfifo", 97 .id = "bfifo",
@@ -105,6 +106,4 @@ struct Qdisc_ops bfifo_qdisc_ops __read_mostly = {
105 .dump = fifo_dump, 106 .dump = fifo_dump,
106 .owner = THIS_MODULE, 107 .owner = THIS_MODULE,
107}; 108};
108
109EXPORT_SYMBOL(bfifo_qdisc_ops); 109EXPORT_SYMBOL(bfifo_qdisc_ops);
110EXPORT_SYMBOL(pfifo_qdisc_ops);
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index ea5a05b172c4..51e64acd5098 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -46,6 +46,7 @@ void qdisc_lock_tree(struct net_device *dev)
46 spin_lock_bh(&dev->queue_lock); 46 spin_lock_bh(&dev->queue_lock);
47 spin_lock(&dev->ingress_lock); 47 spin_lock(&dev->ingress_lock);
48} 48}
49EXPORT_SYMBOL(qdisc_lock_tree);
49 50
50void qdisc_unlock_tree(struct net_device *dev) 51void qdisc_unlock_tree(struct net_device *dev)
51 __releases(dev->ingress_lock) 52 __releases(dev->ingress_lock)
@@ -54,6 +55,7 @@ void qdisc_unlock_tree(struct net_device *dev)
54 spin_unlock(&dev->ingress_lock); 55 spin_unlock(&dev->ingress_lock);
55 spin_unlock_bh(&dev->queue_lock); 56 spin_unlock_bh(&dev->queue_lock);
56} 57}
58EXPORT_SYMBOL(qdisc_unlock_tree);
57 59
58static inline int qdisc_qlen(struct Qdisc *q) 60static inline int qdisc_qlen(struct Qdisc *q)
59{ 61{
@@ -253,6 +255,7 @@ void netif_carrier_on(struct net_device *dev)
253 __netdev_watchdog_up(dev); 255 __netdev_watchdog_up(dev);
254 } 256 }
255} 257}
258EXPORT_SYMBOL(netif_carrier_on);
256 259
257/** 260/**
258 * netif_carrier_off - clear carrier 261 * netif_carrier_off - clear carrier
@@ -265,6 +268,7 @@ void netif_carrier_off(struct net_device *dev)
265 if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state)) 268 if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state))
266 linkwatch_fire_event(dev); 269 linkwatch_fire_event(dev);
267} 270}
271EXPORT_SYMBOL(netif_carrier_off);
268 272
269/* "NOOP" scheduler: the best scheduler, recommended for all interfaces 273/* "NOOP" scheduler: the best scheduler, recommended for all interfaces
270 under all circumstances. It is difficult to invent anything faster or 274 under all circumstances. It is difficult to invent anything faster or
@@ -307,6 +311,7 @@ struct Qdisc noop_qdisc = {
307 .ops = &noop_qdisc_ops, 311 .ops = &noop_qdisc_ops,
308 .list = LIST_HEAD_INIT(noop_qdisc.list), 312 .list = LIST_HEAD_INIT(noop_qdisc.list),
309}; 313};
314EXPORT_SYMBOL(noop_qdisc);
310 315
311static struct Qdisc_ops noqueue_qdisc_ops __read_mostly = { 316static struct Qdisc_ops noqueue_qdisc_ops __read_mostly = {
312 .id = "noqueue", 317 .id = "noqueue",
@@ -471,6 +476,7 @@ struct Qdisc * qdisc_create_dflt(struct net_device *dev, struct Qdisc_ops *ops,
471errout: 476errout:
472 return NULL; 477 return NULL;
473} 478}
479EXPORT_SYMBOL(qdisc_create_dflt);
474 480
475/* Under dev->queue_lock and BH! */ 481/* Under dev->queue_lock and BH! */
476 482
@@ -481,6 +487,7 @@ void qdisc_reset(struct Qdisc *qdisc)
481 if (ops->reset) 487 if (ops->reset)
482 ops->reset(qdisc); 488 ops->reset(qdisc);
483} 489}
490EXPORT_SYMBOL(qdisc_reset);
484 491
485/* this is the rcu callback function to clean up a qdisc when there 492/* this is the rcu callback function to clean up a qdisc when there
486 * are no further references to it */ 493 * are no further references to it */
@@ -512,6 +519,7 @@ void qdisc_destroy(struct Qdisc *qdisc)
512 dev_put(qdisc->dev); 519 dev_put(qdisc->dev);
513 call_rcu(&qdisc->q_rcu, __qdisc_destroy); 520 call_rcu(&qdisc->q_rcu, __qdisc_destroy);
514} 521}
522EXPORT_SYMBOL(qdisc_destroy);
515 523
516void dev_activate(struct net_device *dev) 524void dev_activate(struct net_device *dev)
517{ 525{
@@ -626,12 +634,3 @@ void dev_shutdown(struct net_device *dev)
626 BUG_TRAP(!timer_pending(&dev->watchdog_timer)); 634 BUG_TRAP(!timer_pending(&dev->watchdog_timer));
627 qdisc_unlock_tree(dev); 635 qdisc_unlock_tree(dev);
628} 636}
629
630EXPORT_SYMBOL(netif_carrier_on);
631EXPORT_SYMBOL(netif_carrier_off);
632EXPORT_SYMBOL(noop_qdisc);
633EXPORT_SYMBOL(qdisc_create_dflt);
634EXPORT_SYMBOL(qdisc_destroy);
635EXPORT_SYMBOL(qdisc_reset);
636EXPORT_SYMBOL(qdisc_lock_tree);
637EXPORT_SYMBOL(qdisc_unlock_tree);