net/core: EXPORT_SYMBOL cleanups

CodingStyle cleanups

EXPORT_SYMBOL should immediately follow the symbol declaration.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2010-07-09 21:22:04 +00:00 committed by David S. Miller
parent 4bc2f18ba4
commit 9e34a5b516
13 changed files with 32 additions and 53 deletions

View File

@ -219,6 +219,7 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags,
return __skb_recv_datagram(sk, flags | (noblock ? MSG_DONTWAIT : 0), return __skb_recv_datagram(sk, flags | (noblock ? MSG_DONTWAIT : 0),
&peeked, err); &peeked, err);
} }
EXPORT_SYMBOL(skb_recv_datagram);
void skb_free_datagram(struct sock *sk, struct sk_buff *skb) void skb_free_datagram(struct sock *sk, struct sk_buff *skb)
{ {
@ -288,7 +289,6 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
return err; return err;
} }
EXPORT_SYMBOL(skb_kill_datagram); EXPORT_SYMBOL(skb_kill_datagram);
/** /**
@ -373,6 +373,7 @@ int skb_copy_datagram_iovec(const struct sk_buff *skb, int offset,
fault: fault:
return -EFAULT; return -EFAULT;
} }
EXPORT_SYMBOL(skb_copy_datagram_iovec);
/** /**
* skb_copy_datagram_const_iovec - Copy a datagram to an iovec. * skb_copy_datagram_const_iovec - Copy a datagram to an iovec.
@ -716,6 +717,7 @@ csum_error:
fault: fault:
return -EFAULT; return -EFAULT;
} }
EXPORT_SYMBOL(skb_copy_and_csum_datagram_iovec);
/** /**
* datagram_poll - generic datagram poll * datagram_poll - generic datagram poll
@ -770,8 +772,4 @@ unsigned int datagram_poll(struct file *file, struct socket *sock,
return mask; return mask;
} }
EXPORT_SYMBOL(datagram_poll); EXPORT_SYMBOL(datagram_poll);
EXPORT_SYMBOL(skb_copy_and_csum_datagram_iovec);
EXPORT_SYMBOL(skb_copy_datagram_iovec);
EXPORT_SYMBOL(skb_recv_datagram);

View File

@ -62,6 +62,7 @@ struct flow_cache {
}; };
atomic_t flow_cache_genid = ATOMIC_INIT(0); atomic_t flow_cache_genid = ATOMIC_INIT(0);
EXPORT_SYMBOL(flow_cache_genid);
static struct flow_cache flow_cache_global; static struct flow_cache flow_cache_global;
static struct kmem_cache *flow_cachep; static struct kmem_cache *flow_cachep;
@ -291,6 +292,7 @@ ret_object:
local_bh_enable(); local_bh_enable();
return flo; return flo;
} }
EXPORT_SYMBOL(flow_cache_lookup);
static void flow_cache_flush_tasklet(unsigned long data) static void flow_cache_flush_tasklet(unsigned long data)
{ {
@ -424,6 +426,3 @@ static int __init flow_cache_init_global(void)
} }
module_init(flow_cache_init_global); module_init(flow_cache_init_global);
EXPORT_SYMBOL(flow_cache_genid);
EXPORT_SYMBOL(flow_cache_lookup);

View File

@ -73,6 +73,7 @@ gnet_stats_start_copy_compat(struct sk_buff *skb, int type, int tc_stats_type,
return 0; return 0;
} }
EXPORT_SYMBOL(gnet_stats_start_copy_compat);
/** /**
* gnet_stats_start_copy_compat - start dumping procedure in compatibility mode * gnet_stats_start_copy_compat - start dumping procedure in compatibility mode
@ -93,6 +94,7 @@ gnet_stats_start_copy(struct sk_buff *skb, int type, spinlock_t *lock,
{ {
return gnet_stats_start_copy_compat(skb, type, 0, 0, lock, d); return gnet_stats_start_copy_compat(skb, type, 0, 0, lock, d);
} }
EXPORT_SYMBOL(gnet_stats_start_copy);
/** /**
* gnet_stats_copy_basic - copy basic statistics into statistic TLV * gnet_stats_copy_basic - copy basic statistics into statistic TLV
@ -123,6 +125,7 @@ gnet_stats_copy_basic(struct gnet_dump *d, struct gnet_stats_basic_packed *b)
} }
return 0; return 0;
} }
EXPORT_SYMBOL(gnet_stats_copy_basic);
/** /**
* gnet_stats_copy_rate_est - copy rate estimator statistics into statistics TLV * gnet_stats_copy_rate_est - copy rate estimator statistics into statistics TLV
@ -154,6 +157,7 @@ gnet_stats_copy_rate_est(struct gnet_dump *d,
return 0; return 0;
} }
EXPORT_SYMBOL(gnet_stats_copy_rate_est);
/** /**
* gnet_stats_copy_queue - copy queue statistics into statistics TLV * gnet_stats_copy_queue - copy queue statistics into statistics TLV
@ -181,6 +185,7 @@ gnet_stats_copy_queue(struct gnet_dump *d, struct gnet_stats_queue *q)
return 0; return 0;
} }
EXPORT_SYMBOL(gnet_stats_copy_queue);
/** /**
* gnet_stats_copy_app - copy application specific statistics into statistics TLV * gnet_stats_copy_app - copy application specific statistics into statistics TLV
@ -208,6 +213,7 @@ gnet_stats_copy_app(struct gnet_dump *d, void *st, int len)
return 0; return 0;
} }
EXPORT_SYMBOL(gnet_stats_copy_app);
/** /**
* gnet_stats_finish_copy - finish dumping procedure * gnet_stats_finish_copy - finish dumping procedure
@ -241,12 +247,4 @@ gnet_stats_finish_copy(struct gnet_dump *d)
spin_unlock_bh(d->lock); spin_unlock_bh(d->lock);
return 0; return 0;
} }
EXPORT_SYMBOL(gnet_stats_start_copy);
EXPORT_SYMBOL(gnet_stats_start_copy_compat);
EXPORT_SYMBOL(gnet_stats_copy_basic);
EXPORT_SYMBOL(gnet_stats_copy_rate_est);
EXPORT_SYMBOL(gnet_stats_copy_queue);
EXPORT_SYMBOL(gnet_stats_copy_app);
EXPORT_SYMBOL(gnet_stats_finish_copy); EXPORT_SYMBOL(gnet_stats_finish_copy);

View File

@ -95,6 +95,7 @@ int memcpy_toiovec(struct iovec *iov, unsigned char *kdata, int len)
return 0; return 0;
} }
EXPORT_SYMBOL(memcpy_toiovec);
/* /*
* Copy kernel to iovec. Returns -EFAULT on error. * Copy kernel to iovec. Returns -EFAULT on error.
@ -120,6 +121,7 @@ int memcpy_toiovecend(const struct iovec *iov, unsigned char *kdata,
return 0; return 0;
} }
EXPORT_SYMBOL(memcpy_toiovecend);
/* /*
* Copy iovec to kernel. Returns -EFAULT on error. * Copy iovec to kernel. Returns -EFAULT on error.
@ -144,6 +146,7 @@ int memcpy_fromiovec(unsigned char *kdata, struct iovec *iov, int len)
return 0; return 0;
} }
EXPORT_SYMBOL(memcpy_fromiovec);
/* /*
* Copy iovec from kernel. Returns -EFAULT on error. * Copy iovec from kernel. Returns -EFAULT on error.
@ -172,6 +175,7 @@ int memcpy_fromiovecend(unsigned char *kdata, const struct iovec *iov,
return 0; return 0;
} }
EXPORT_SYMBOL(memcpy_fromiovecend);
/* /*
* And now for the all-in-one: copy and checksum from a user iovec * And now for the all-in-one: copy and checksum from a user iovec
@ -256,9 +260,4 @@ out_fault:
err = -EFAULT; err = -EFAULT;
goto out; goto out;
} }
EXPORT_SYMBOL(csum_partial_copy_fromiovecend); EXPORT_SYMBOL(csum_partial_copy_fromiovecend);
EXPORT_SYMBOL(memcpy_fromiovec);
EXPORT_SYMBOL(memcpy_fromiovecend);
EXPORT_SYMBOL(memcpy_toiovec);
EXPORT_SYMBOL(memcpy_toiovecend);

View File

@ -243,5 +243,4 @@ void linkwatch_fire_event(struct net_device *dev)
linkwatch_schedule_work(urgent); linkwatch_schedule_work(urgent);
} }
EXPORT_SYMBOL(linkwatch_fire_event); EXPORT_SYMBOL(linkwatch_fire_event);

View File

@ -924,13 +924,12 @@ int netdev_class_create_file(struct class_attribute *class_attr)
{ {
return class_create_file(&net_class, class_attr); return class_create_file(&net_class, class_attr);
} }
EXPORT_SYMBOL(netdev_class_create_file);
void netdev_class_remove_file(struct class_attribute *class_attr) void netdev_class_remove_file(struct class_attribute *class_attr)
{ {
class_remove_file(&net_class, class_attr); class_remove_file(&net_class, class_attr);
} }
EXPORT_SYMBOL(netdev_class_create_file);
EXPORT_SYMBOL(netdev_class_remove_file); EXPORT_SYMBOL(netdev_class_remove_file);
int netdev_kobject_init(void) int netdev_kobject_init(void)

View File

@ -35,6 +35,7 @@ int register_netevent_notifier(struct notifier_block *nb)
err = atomic_notifier_chain_register(&netevent_notif_chain, nb); err = atomic_notifier_chain_register(&netevent_notif_chain, nb);
return err; return err;
} }
EXPORT_SYMBOL_GPL(register_netevent_notifier);
/** /**
* netevent_unregister_notifier - unregister a netevent notifier block * netevent_unregister_notifier - unregister a netevent notifier block
@ -50,6 +51,7 @@ int unregister_netevent_notifier(struct notifier_block *nb)
{ {
return atomic_notifier_chain_unregister(&netevent_notif_chain, nb); return atomic_notifier_chain_unregister(&netevent_notif_chain, nb);
} }
EXPORT_SYMBOL_GPL(unregister_netevent_notifier);
/** /**
* call_netevent_notifiers - call all netevent notifier blocks * call_netevent_notifiers - call all netevent notifier blocks
@ -64,7 +66,4 @@ int call_netevent_notifiers(unsigned long val, void *v)
{ {
return atomic_notifier_call_chain(&netevent_notif_chain, val, v); return atomic_notifier_call_chain(&netevent_notif_chain, val, v);
} }
EXPORT_SYMBOL_GPL(register_netevent_notifier);
EXPORT_SYMBOL_GPL(unregister_netevent_notifier);
EXPORT_SYMBOL_GPL(call_netevent_notifiers); EXPORT_SYMBOL_GPL(call_netevent_notifiers);

View File

@ -197,11 +197,13 @@ void netpoll_poll_dev(struct net_device *dev)
service_arp_queue(dev->npinfo); service_arp_queue(dev->npinfo);
} }
EXPORT_SYMBOL(netpoll_poll_dev);
void netpoll_poll(struct netpoll *np) void netpoll_poll(struct netpoll *np)
{ {
netpoll_poll_dev(np->dev); netpoll_poll_dev(np->dev);
} }
EXPORT_SYMBOL(netpoll_poll);
static void refill_skbs(void) static void refill_skbs(void)
{ {
@ -313,6 +315,7 @@ void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
schedule_delayed_work(&npinfo->tx_work,0); schedule_delayed_work(&npinfo->tx_work,0);
} }
} }
EXPORT_SYMBOL(netpoll_send_skb);
void netpoll_send_udp(struct netpoll *np, const char *msg, int len) void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
{ {
@ -374,6 +377,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
netpoll_send_skb(np, skb); netpoll_send_skb(np, skb);
} }
EXPORT_SYMBOL(netpoll_send_udp);
static void arp_reply(struct sk_buff *skb) static void arp_reply(struct sk_buff *skb)
{ {
@ -600,6 +604,7 @@ void netpoll_print_options(struct netpoll *np)
printk(KERN_INFO "%s: remote ethernet address %pM\n", printk(KERN_INFO "%s: remote ethernet address %pM\n",
np->name, np->remote_mac); np->name, np->remote_mac);
} }
EXPORT_SYMBOL(netpoll_print_options);
int netpoll_parse_options(struct netpoll *np, char *opt) int netpoll_parse_options(struct netpoll *np, char *opt)
{ {
@ -692,6 +697,7 @@ int netpoll_parse_options(struct netpoll *np, char *opt)
np->name, cur); np->name, cur);
return -1; return -1;
} }
EXPORT_SYMBOL(netpoll_parse_options);
int __netpoll_setup(struct netpoll *np) int __netpoll_setup(struct netpoll *np)
{ {
@ -848,6 +854,7 @@ put:
dev_put(ndev); dev_put(ndev);
return err; return err;
} }
EXPORT_SYMBOL(netpoll_setup);
static int __init netpoll_init(void) static int __init netpoll_init(void)
{ {
@ -908,11 +915,13 @@ void netpoll_cleanup(struct netpoll *np)
dev_put(np->dev); dev_put(np->dev);
np->dev = NULL; np->dev = NULL;
} }
EXPORT_SYMBOL(netpoll_cleanup);
int netpoll_trap(void) int netpoll_trap(void)
{ {
return atomic_read(&trapped); return atomic_read(&trapped);
} }
EXPORT_SYMBOL(netpoll_trap);
void netpoll_set_trap(int trap) void netpoll_set_trap(int trap)
{ {
@ -921,14 +930,4 @@ void netpoll_set_trap(int trap)
else else
atomic_dec(&trapped); atomic_dec(&trapped);
} }
EXPORT_SYMBOL(netpoll_send_skb);
EXPORT_SYMBOL(netpoll_set_trap); EXPORT_SYMBOL(netpoll_set_trap);
EXPORT_SYMBOL(netpoll_trap);
EXPORT_SYMBOL(netpoll_print_options);
EXPORT_SYMBOL(netpoll_parse_options);
EXPORT_SYMBOL(netpoll_setup);
EXPORT_SYMBOL(netpoll_cleanup);
EXPORT_SYMBOL(netpoll_send_udp);
EXPORT_SYMBOL(netpoll_poll_dev);
EXPORT_SYMBOL(netpoll_poll);

View File

@ -686,7 +686,7 @@ static size_t rtnl_port_size(const struct net_device *dev)
return port_self_size; return port_self_size;
} }
static inline size_t if_nlmsg_size(const struct net_device *dev) static noinline size_t if_nlmsg_size(const struct net_device *dev)
{ {
return NLMSG_ALIGN(sizeof(struct ifinfomsg)) return NLMSG_ALIGN(sizeof(struct ifinfomsg))
+ nla_total_size(IFNAMSIZ) /* IFLA_IFNAME */ + nla_total_size(IFNAMSIZ) /* IFLA_IFNAME */

View File

@ -130,6 +130,7 @@ void __scm_destroy(struct scm_cookie *scm)
} }
} }
} }
EXPORT_SYMBOL(__scm_destroy);
int __scm_send(struct socket *sock, struct msghdr *msg, struct scm_cookie *p) int __scm_send(struct socket *sock, struct msghdr *msg, struct scm_cookie *p)
{ {
@ -211,6 +212,7 @@ error:
scm_destroy(p); scm_destroy(p);
return err; return err;
} }
EXPORT_SYMBOL(__scm_send);
int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data) int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
{ {
@ -249,6 +251,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
out: out:
return err; return err;
} }
EXPORT_SYMBOL(put_cmsg);
void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm) void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
{ {
@ -318,6 +321,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
*/ */
__scm_destroy(scm); __scm_destroy(scm);
} }
EXPORT_SYMBOL(scm_detach_fds);
struct scm_fp_list *scm_fp_dup(struct scm_fp_list *fpl) struct scm_fp_list *scm_fp_dup(struct scm_fp_list *fpl)
{ {
@ -335,9 +339,4 @@ struct scm_fp_list *scm_fp_dup(struct scm_fp_list *fpl)
} }
return new_fpl; return new_fpl;
} }
EXPORT_SYMBOL(__scm_destroy);
EXPORT_SYMBOL(__scm_send);
EXPORT_SYMBOL(put_cmsg);
EXPORT_SYMBOL(scm_detach_fds);
EXPORT_SYMBOL(scm_fp_dup); EXPORT_SYMBOL(scm_fp_dup);

View File

@ -2483,7 +2483,6 @@ unsigned char *skb_pull_rcsum(struct sk_buff *skb, unsigned int len)
skb_postpull_rcsum(skb, skb->data, len); skb_postpull_rcsum(skb, skb->data, len);
return skb->data += len; return skb->data += len;
} }
EXPORT_SYMBOL_GPL(skb_pull_rcsum); EXPORT_SYMBOL_GPL(skb_pull_rcsum);
/** /**

View File

@ -43,7 +43,6 @@ void sk_stream_write_space(struct sock *sk)
rcu_read_unlock(); rcu_read_unlock();
} }
} }
EXPORT_SYMBOL(sk_stream_write_space); EXPORT_SYMBOL(sk_stream_write_space);
/** /**
@ -81,7 +80,6 @@ int sk_stream_wait_connect(struct sock *sk, long *timeo_p)
} while (!done); } while (!done);
return 0; return 0;
} }
EXPORT_SYMBOL(sk_stream_wait_connect); EXPORT_SYMBOL(sk_stream_wait_connect);
/** /**
@ -109,7 +107,6 @@ void sk_stream_wait_close(struct sock *sk, long timeout)
finish_wait(sk_sleep(sk), &wait); finish_wait(sk_sleep(sk), &wait);
} }
} }
EXPORT_SYMBOL(sk_stream_wait_close); EXPORT_SYMBOL(sk_stream_wait_close);
/** /**
@ -174,7 +171,6 @@ do_interrupted:
err = sock_intr_errno(*timeo_p); err = sock_intr_errno(*timeo_p);
goto out; goto out;
} }
EXPORT_SYMBOL(sk_stream_wait_memory); EXPORT_SYMBOL(sk_stream_wait_memory);
int sk_stream_error(struct sock *sk, int flags, int err) int sk_stream_error(struct sock *sk, int flags, int err)
@ -185,7 +181,6 @@ int sk_stream_error(struct sock *sk, int flags, int err)
send_sig(SIGPIPE, current, 0); send_sig(SIGPIPE, current, 0);
return err; return err;
} }
EXPORT_SYMBOL(sk_stream_error); EXPORT_SYMBOL(sk_stream_error);
void sk_stream_kill_queues(struct sock *sk) void sk_stream_kill_queues(struct sock *sk)
@ -210,5 +205,4 @@ void sk_stream_kill_queues(struct sock *sk)
* have gone away, only the net layer knows can touch it. * have gone away, only the net layer knows can touch it.
*/ */
} }
EXPORT_SYMBOL(sk_stream_kill_queues); EXPORT_SYMBOL(sk_stream_kill_queues);

View File

@ -77,7 +77,6 @@ __be32 in_aton(const char *str)
} }
return(htonl(l)); return(htonl(l));
} }
EXPORT_SYMBOL(in_aton); EXPORT_SYMBOL(in_aton);
#define IN6PTON_XDIGIT 0x00010000 #define IN6PTON_XDIGIT 0x00010000
@ -162,7 +161,6 @@ out:
*end = s; *end = s;
return ret; return ret;
} }
EXPORT_SYMBOL(in4_pton); EXPORT_SYMBOL(in4_pton);
int in6_pton(const char *src, int srclen, int in6_pton(const char *src, int srclen,
@ -280,7 +278,6 @@ out:
*end = s; *end = s;
return ret; return ret;
} }
EXPORT_SYMBOL(in6_pton); EXPORT_SYMBOL(in6_pton);
void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb, void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb,