Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42bad1da authored by Adrian Bunk's avatar Adrian Bunk Committed by David S. Miller
Browse files

[NETLINK]: 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: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 55404bca

include/net/netfilter/nf_conntrack_l4proto.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -97,7 +97,6 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6; 
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_generic;

extern struct nf_conntrack_l4proto nf_conntrack_l4proto_generic;





#define MAX_NF_CT_PROTO 256

#define MAX_NF_CT_PROTO 256

extern struct nf_conntrack_l4proto **nf_ct_protos[PF_MAX];





extern struct nf_conntrack_l4proto *

extern struct nf_conntrack_l4proto *

__nf_ct_l4proto_find(u_int16_t l3proto, u_int8_t l4proto);

__nf_ct_l4proto_find(u_int16_t l3proto, u_int8_t l4proto);

include/net/netlink.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -217,8 +217,6 @@ struct nl_info { 
extern void		netlink_run_queue(struct sock *sk, unsigned int *qlen,

extern void		netlink_run_queue(struct sock *sk, unsigned int *qlen,

					  int (*cb)(struct sk_buff *,

					  int (*cb)(struct sk_buff *,

						    struct nlmsghdr *));

						    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,

extern int		nlmsg_notify(struct sock *sk, struct sk_buff *skb,

				     u32 pid, unsigned int group, int report,

				     u32 pid, unsigned int group, int report,

				     gfp_t flags);

				     gfp_t flags);

include/net/rtnetlink.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -13,7 +13,6 @@ extern void rtnl_register(int protocol, int msgtype, 
			      rtnl_doit_func, rtnl_dumpit_func);

			      rtnl_doit_func, rtnl_dumpit_func);

extern int	rtnl_unregister(int protocol, int msgtype);

extern int	rtnl_unregister(int protocol, int msgtype);

extern void	rtnl_unregister_all(int protocol);

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)

static inline int rtnl_msg_family(struct nlmsghdr *nlh)

{

{

net/core/rtnetlink.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -97,7 +97,7 @@ int rtattr_parse(struct rtattr *tb[], int maxattr, struct rtattr *rta, int len) 
	return 0;

	return 0;

}

}





struct rtnl_link *rtnl_msg_handlers[NPROTO];

static struct rtnl_link *rtnl_msg_handlers[NPROTO];





static inline int rtm_msgindex(int msgtype)

static inline int rtm_msgindex(int msgtype)

{

{
@@ -765,7 +765,7 @@ static int rtnl_getlink(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) 
	return err;

	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 idx;

	int s_idx = cb->family;

	int s_idx = cb->family;
@@ -789,8 +789,6 @@ int rtnl_dump_all(struct sk_buff *skb, struct netlink_callback *cb) 
	return skb->len;

	return skb->len;

}

}





EXPORT_SYMBOL_GPL(rtnl_dump_all);



void rtmsg_ifinfo(int type, struct net_device *dev, unsigned change)

void rtmsg_ifinfo(int type, struct net_device *dev, unsigned change)

{

{

	struct sk_buff *skb;

	struct sk_buff *skb;

net/netfilter/nf_conntrack_proto.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <net/netfilter/nf_conntrack_l4proto.h>

#include <net/netfilter/nf_conntrack_l4proto.h>

#include <net/netfilter/nf_conntrack_core.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;

struct nf_conntrack_l3proto *nf_ct_l3protos[AF_MAX] __read_mostly;

EXPORT_SYMBOL_GPL(nf_ct_l3protos);

EXPORT_SYMBOL_GPL(nf_ct_l3protos);