* [-mm patch] net/: possible cleanups [not found] <20070402224745.71a25af7.akpm@linux-foundation.org> @ 2007-04-04 15:25 ` Adrian Bunk 0 siblings, 0 replies; 3+ messages in thread From: Adrian Bunk @ 2007-04-04 15:25 UTC (permalink / raw) To: Andrew Morton, David Miller; +Cc: linux-kernel, netdev On Mon, Apr 02, 2007 at 10:47:45PM -0700, Andrew Morton wrote: >... > Changes since 2.6.21-rc5-mm3: >... > git-net.patch >... > git trees. >... This patch contains the following possible cleanups: - make the following needlessly global variables static: - core/rtnetlink.c: struct rtnl_msg_handlers[] - netfilter/nf_conntrack_proto.c: struct nf_ct_protos[] - make the following needlessly global functions static: - core/rtnetlink.c: rtnl_dump_all() - netlink/af_netlink.c: netlink_queue_skip() Signed-off-by: Adrian Bunk <bunk@stusta.de> --- include/net/netfilter/nf_conntrack_l4proto.h | 1 - include/net/netlink.h | 2 -- include/net/rtnetlink.h | 1 - net/core/rtnetlink.c | 6 ++---- net/netfilter/nf_conntrack_proto.c | 2 +- net/netlink/af_netlink.c | 4 ++-- 6 files changed, 5 insertions(+), 11 deletions(-) --- linux-2.6.21-rc5-mm4/include/net/rtnetlink.h.old 2007-04-03 23:58:30.000000000 +0200 +++ linux-2.6.21-rc5-mm4/include/net/rtnetlink.h 2007-04-03 23:58:35.000000000 +0200 @@ -13,7 +13,6 @@ rtnl_doit_func, rtnl_dumpit_func); extern int rtnl_unregister(int protocol, int msgtype); extern void rtnl_unregister_all(int protocol); -extern int rtnl_dump_all(struct sk_buff *skb, struct netlink_callback *cb); static inline int rtnl_msg_family(struct nlmsghdr *nlh) { --- linux-2.6.21-rc5-mm4/net/core/rtnetlink.c.old 2007-04-03 23:34:49.000000000 +0200 +++ linux-2.6.21-rc5-mm4/net/core/rtnetlink.c 2007-04-03 23:58:44.000000000 +0200 @@ -101,7 +101,7 @@ return 0; } -struct rtnl_link *rtnl_msg_handlers[NPROTO]; +static struct rtnl_link *rtnl_msg_handlers[NPROTO]; static inline int rtm_msgindex(int msgtype) { @@ -771,7 +771,7 @@ return err; } -int rtnl_dump_all(struct sk_buff *skb, struct netlink_callback *cb) +static int rtnl_dump_all(struct sk_buff *skb, struct netlink_callback *cb) { int idx; int s_idx = cb->family; @@ -795,8 +795,6 @@ return skb->len; } -EXPORT_SYMBOL_GPL(rtnl_dump_all); - void rtmsg_ifinfo(int type, struct net_device *dev, unsigned change) { struct sk_buff *skb; --- linux-2.6.21-rc5-mm4/include/net/netfilter/nf_conntrack_l4proto.h.old 2007-04-04 01:22:41.000000000 +0200 +++ linux-2.6.21-rc5-mm4/include/net/netfilter/nf_conntrack_l4proto.h 2007-04-04 01:22:50.000000000 +0200 @@ -97,7 +97,6 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_generic; #define MAX_NF_CT_PROTO 256 -extern struct nf_conntrack_l4proto **nf_ct_protos[PF_MAX]; extern struct nf_conntrack_l4proto * __nf_ct_l4proto_find(u_int16_t l3proto, u_int8_t l4proto); --- linux-2.6.21-rc5-mm4/net/netfilter/nf_conntrack_proto.c.old 2007-04-04 00:00:26.000000000 +0200 +++ linux-2.6.21-rc5-mm4/net/netfilter/nf_conntrack_proto.c 2007-04-04 00:00:43.000000000 +0200 @@ -28,7 +28,7 @@ #include <net/netfilter/nf_conntrack_l4proto.h> #include <net/netfilter/nf_conntrack_core.h> -struct nf_conntrack_l4proto **nf_ct_protos[PF_MAX] __read_mostly; +static struct nf_conntrack_l4proto **nf_ct_protos[PF_MAX] __read_mostly; struct nf_conntrack_l3proto *nf_ct_l3protos[AF_MAX] __read_mostly; EXPORT_SYMBOL_GPL(nf_ct_l3protos); --- linux-2.6.21-rc5-mm4/include/net/netlink.h.old 2007-04-04 00:01:21.000000000 +0200 +++ linux-2.6.21-rc5-mm4/include/net/netlink.h 2007-04-04 00:01:52.000000000 +0200 @@ -217,8 +217,6 @@ extern void netlink_run_queue(struct sock *sk, unsigned int *qlen, int (*cb)(struct sk_buff *, struct nlmsghdr *)); -extern void netlink_queue_skip(struct nlmsghdr *nlh, - struct sk_buff *skb); extern int nlmsg_notify(struct sock *sk, struct sk_buff *skb, u32 pid, unsigned int group, int report, gfp_t flags); --- linux-2.6.21-rc5-mm4/net/netlink/af_netlink.c.old 2007-04-04 00:01:59.000000000 +0200 +++ linux-2.6.21-rc5-mm4/net/netlink/af_netlink.c 2007-04-04 00:02:22.000000000 +0200 @@ -117,6 +117,7 @@ static int netlink_dump(struct sock *sk); static void netlink_destroy_callback(struct netlink_callback *cb); +static void netlink_queue_skip(struct nlmsghdr *nlh, struct sk_buff *skb); static DEFINE_RWLOCK(nl_table_lock); static atomic_t nl_table_users = ATOMIC_INIT(0); @@ -1555,7 +1556,7 @@ * Pulls the given netlink message off the socket buffer so the next * call to netlink_queue_run() will not reconsider the message. */ -void netlink_queue_skip(struct nlmsghdr *nlh, struct sk_buff *skb) +static void netlink_queue_skip(struct nlmsghdr *nlh, struct sk_buff *skb) { int msglen = NLMSG_ALIGN(nlh->nlmsg_len); @@ -1838,7 +1839,6 @@ EXPORT_SYMBOL(netlink_ack); EXPORT_SYMBOL(netlink_run_queue); -EXPORT_SYMBOL(netlink_queue_skip); EXPORT_SYMBOL(netlink_broadcast); EXPORT_SYMBOL(netlink_dump_start); EXPORT_SYMBOL(netlink_kernel_create); ^ permalink raw reply [flat|nested] 3+ messages in thread
[parent not found: <20061123021703.8550e37e.akpm@osdl.org>]
* [-mm patch] net/: possible cleanups [not found] <20061123021703.8550e37e.akpm@osdl.org> @ 2006-11-24 21:58 ` Adrian Bunk 2006-12-01 1:28 ` David Miller 0 siblings, 1 reply; 3+ messages in thread From: Adrian Bunk @ 2006-11-24 21:58 UTC (permalink / raw) To: Andrew Morton, davem; +Cc: linux-kernel, netdev On Thu, Nov 23, 2006 at 02:17:03AM -0800, Andrew Morton wrote: >... > Changes since 2.6.19-rc5-mm2: >... > git-net.patch >... > git trees >... This patch contains the following possible cleanups: - make the following needlessly global functions statis: - ipv4/tcp.c: __tcp_alloc_md5sig_pool() - ipv4/tcp_ipv4.c: tcp_v4_reqsk_md5_lookup() - ipv4/udplite.c: udplite_rcv() - ipv4/udplite.c: udplite_err() - make the following needlessly global structs static: - ipv4/tcp_ipv4.c: tcp_request_sock_ipv4_ops - ipv4/tcp_ipv4.c: tcp_sock_ipv4_specific - ipv6/tcp_ipv6.c: tcp_request_sock_ipv6_ops - net/ipv{4,6}/udplite.c: remove inline's from static functions (gcc should know best when to inline them) Signed-off-by: Adrian Bunk <bunk@stusta.de> --- net/ipv4/tcp.c | 2 +- net/ipv4/tcp_ipv4.c | 8 ++++---- net/ipv4/udplite.c | 10 +++++----- net/ipv6/tcp_ipv6.c | 2 +- net/ipv6/udplite.c | 10 +++++----- 5 files changed, 16 insertions(+), 16 deletions(-) --- linux-2.6.19-rc6-mm1/net/ipv4/tcp.c.old 2006-11-24 01:30:11.000000000 +0100 +++ linux-2.6.19-rc6-mm1/net/ipv4/tcp.c 2006-11-24 01:31:21.000000000 +0100 @@ -2288,7 +2288,7 @@ EXPORT_SYMBOL(tcp_free_md5sig_pool); -struct tcp_md5sig_pool **__tcp_alloc_md5sig_pool(void) +static struct tcp_md5sig_pool **__tcp_alloc_md5sig_pool(void) { int cpu; struct tcp_md5sig_pool **pool; --- linux-2.6.19-rc6-mm1/net/ipv4/tcp_ipv4.c.old 2006-11-24 01:31:31.000000000 +0100 +++ linux-2.6.19-rc6-mm1/net/ipv4/tcp_ipv4.c 2006-11-24 01:33:00.000000000 +0100 @@ -841,8 +841,8 @@ EXPORT_SYMBOL(tcp_v4_md5_lookup); -struct tcp_md5sig_key *tcp_v4_reqsk_md5_lookup(struct sock *sk, - struct request_sock *req) +static struct tcp_md5sig_key *tcp_v4_reqsk_md5_lookup(struct sock *sk, + struct request_sock *req) { return tcp_v4_md5_do_lookup(sk, inet_rsk(req)->rmt_addr); } @@ -1273,7 +1273,7 @@ .send_reset = tcp_v4_send_reset, }; -struct tcp_request_sock_ops tcp_request_sock_ipv4_ops = { +static struct tcp_request_sock_ops tcp_request_sock_ipv4_ops = { #ifdef CONFIG_TCP_MD5SIG .md5_lookup = tcp_v4_reqsk_md5_lookup, #endif @@ -1861,7 +1861,7 @@ #endif }; -struct tcp_sock_af_ops tcp_sock_ipv4_specific = { +static struct tcp_sock_af_ops tcp_sock_ipv4_specific = { #ifdef CONFIG_TCP_MD5SIG .md5_lookup = tcp_v4_md5_lookup, .calc_md5_hash = tcp_v4_calc_md5_hash, --- linux-2.6.19-rc6-mm1/net/ipv4/udplite.c.old 2006-11-24 01:33:19.000000000 +0100 +++ linux-2.6.19-rc6-mm1/net/ipv4/udplite.c 2006-11-24 01:34:07.000000000 +0100 @@ -18,23 +18,23 @@ struct hlist_head udplite_hash[UDP_HTABLE_SIZE]; static int udplite_port_rover; -__inline__ int udplite_get_port(struct sock *sk, unsigned short p, - int (*c)(const struct sock *, const struct sock *)) +int udplite_get_port(struct sock *sk, unsigned short p, + int (*c)(const struct sock *, const struct sock *)) { return __udp_lib_get_port(sk, p, udplite_hash, &udplite_port_rover, c); } -static __inline__ int udplite_v4_get_port(struct sock *sk, unsigned short snum) +static int udplite_v4_get_port(struct sock *sk, unsigned short snum) { return udplite_get_port(sk, snum, ipv4_rcv_saddr_equal); } -__inline__ int udplite_rcv(struct sk_buff *skb) +static int udplite_rcv(struct sk_buff *skb) { return __udp4_lib_rcv(skb, udplite_hash, 1); } -__inline__ void udplite_err(struct sk_buff *skb, u32 info) +static void udplite_err(struct sk_buff *skb, u32 info) { return __udp4_lib_err(skb, info, udplite_hash); } --- linux-2.6.19-rc6-mm1/net/ipv6/udplite.c.old 2006-11-24 01:34:21.000000000 +0100 +++ linux-2.6.19-rc6-mm1/net/ipv6/udplite.c 2006-11-24 01:51:24.000000000 +0100 @@ -17,14 +17,14 @@ DEFINE_SNMP_STAT(struct udp_mib, udplite_stats_in6) __read_mostly; -static __inline__ int udplitev6_rcv(struct sk_buff **pskb) +static int udplitev6_rcv(struct sk_buff **pskb) { return __udp6_lib_rcv(pskb, udplite_hash, 1); } -static __inline__ void udplitev6_err(struct sk_buff *skb, - struct inet6_skb_parm *opt, - int type, int code, int offset, __be32 info) +static void udplitev6_err(struct sk_buff *skb, + struct inet6_skb_parm *opt, + int type, int code, int offset, __be32 info) { return __udp6_lib_err(skb, opt, type, code, offset, info, udplite_hash); } @@ -35,7 +35,7 @@ .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL, }; -static __inline__ int udplite_v6_get_port(struct sock *sk, unsigned short snum) +static int udplite_v6_get_port(struct sock *sk, unsigned short snum) { return udplite_get_port(sk, snum, ipv6_rcv_saddr_equal); } --- linux-2.6.19-rc6-mm1/net/ipv6/tcp_ipv6.c.old 2006-11-24 01:35:02.000000000 +0100 +++ linux-2.6.19-rc6-mm1/net/ipv6/tcp_ipv6.c 2006-11-24 01:35:14.000000000 +0100 @@ -929,7 +929,7 @@ .send_reset = tcp_v6_send_reset }; -struct tcp_request_sock_ops tcp_request_sock_ipv6_ops = { +static struct tcp_request_sock_ops tcp_request_sock_ipv6_ops = { #ifdef CONFIG_TCP_MD5SIG .md5_lookup = tcp_v6_reqsk_md5_lookup, #endif ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [-mm patch] net/: possible cleanups 2006-11-24 21:58 ` Adrian Bunk @ 2006-12-01 1:28 ` David Miller 0 siblings, 0 replies; 3+ messages in thread From: David Miller @ 2006-12-01 1:28 UTC (permalink / raw) To: bunk; +Cc: akpm, linux-kernel, netdev From: Adrian Bunk <bunk@stusta.de> Date: Fri, 24 Nov 2006 22:58:20 +0100 > This patch contains the following possible cleanups: > - make the following needlessly global functions statis: > - ipv4/tcp.c: __tcp_alloc_md5sig_pool() > - ipv4/tcp_ipv4.c: tcp_v4_reqsk_md5_lookup() > - ipv4/udplite.c: udplite_rcv() > - ipv4/udplite.c: udplite_err() > - make the following needlessly global structs static: > - ipv4/tcp_ipv4.c: tcp_request_sock_ipv4_ops > - ipv4/tcp_ipv4.c: tcp_sock_ipv4_specific > - ipv6/tcp_ipv6.c: tcp_request_sock_ipv6_ops > - net/ipv{4,6}/udplite.c: remove inline's from static functions > (gcc should know best when to inline them) > > Signed-off-by: Adrian Bunk <bunk@stusta.de> Applied, thanks Adrian. ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-04-04 15:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20070402224745.71a25af7.akpm@linux-foundation.org>
2007-04-04 15:25 ` [-mm patch] net/: possible cleanups Adrian Bunk
[not found] <20061123021703.8550e37e.akpm@osdl.org>
2006-11-24 21:58 ` Adrian Bunk
2006-12-01 1:28 ` David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).