diff options
author | Richard Alpe <richard.alpe@ericsson.com> | 2014-11-24 05:10:29 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-11-24 16:10:23 -0500 |
commit | d8182804cfd6503e73dc1c0a409903412a389541 (patch) | |
tree | 13a0d359beeb8b436c5977d711e010e04a8b5d2d /net/tipc | |
parent | 958d03b016586d571a382f863608bc4c6d92a0c8 (diff) |
tipc: fix sparse warnings in new nl api
Fix sparse warnings about non-static declaration of static functions
in the new tipc netlink API.
Signed-off-by: Richard Alpe <richard.alpe@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
-rw-r--r-- | net/tipc/bcast.c | 3 | ||||
-rw-r--r-- | net/tipc/bearer.c | 6 | ||||
-rw-r--r-- | net/tipc/link.c | 10 | ||||
-rw-r--r-- | net/tipc/name_table.c | 13 | ||||
-rw-r--r-- | net/tipc/node.c | 2 | ||||
-rw-r--r-- | net/tipc/socket.c | 16 |
6 files changed, 29 insertions, 21 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index dcf3589e3cc5..556b26ad4b1e 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c | |||
@@ -767,7 +767,8 @@ void tipc_bcbearer_sort(struct tipc_node_map *nm_ptr, u32 node, bool action) | |||
767 | tipc_bclink_unlock(); | 767 | tipc_bclink_unlock(); |
768 | } | 768 | } |
769 | 769 | ||
770 | int __tipc_nl_add_bc_link_stat(struct sk_buff *skb, struct tipc_stats *stats) | 770 | static int __tipc_nl_add_bc_link_stat(struct sk_buff *skb, |
771 | struct tipc_stats *stats) | ||
771 | { | 772 | { |
772 | int i; | 773 | int i; |
773 | struct nlattr *nest; | 774 | struct nlattr *nest; |
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index 5f6f32369c16..463db5b15b8b 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c | |||
@@ -647,7 +647,8 @@ void tipc_bearer_stop(void) | |||
647 | } | 647 | } |
648 | 648 | ||
649 | /* Caller should hold rtnl_lock to protect the bearer */ | 649 | /* Caller should hold rtnl_lock to protect the bearer */ |
650 | int __tipc_nl_add_bearer(struct tipc_nl_msg *msg, struct tipc_bearer *bearer) | 650 | static int __tipc_nl_add_bearer(struct tipc_nl_msg *msg, |
651 | struct tipc_bearer *bearer) | ||
651 | { | 652 | { |
652 | void *hdr; | 653 | void *hdr; |
653 | struct nlattr *attrs; | 654 | struct nlattr *attrs; |
@@ -905,7 +906,8 @@ int tipc_nl_bearer_set(struct sk_buff *skb, struct genl_info *info) | |||
905 | return 0; | 906 | return 0; |
906 | } | 907 | } |
907 | 908 | ||
908 | int __tipc_nl_add_media(struct tipc_nl_msg *msg, struct tipc_media *media) | 909 | static int __tipc_nl_add_media(struct tipc_nl_msg *msg, |
910 | struct tipc_media *media) | ||
909 | { | 911 | { |
910 | void *hdr; | 912 | void *hdr; |
911 | struct nlattr *attrs; | 913 | struct nlattr *attrs; |
diff --git a/net/tipc/link.c b/net/tipc/link.c index 629e8cf393bf..4738cb1bf7c0 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c | |||
@@ -2514,7 +2514,8 @@ out: | |||
2514 | 2514 | ||
2515 | return res; | 2515 | return res; |
2516 | } | 2516 | } |
2517 | int __tipc_nl_add_stats(struct sk_buff *skb, struct tipc_stats *s) | 2517 | |
2518 | static int __tipc_nl_add_stats(struct sk_buff *skb, struct tipc_stats *s) | ||
2518 | { | 2519 | { |
2519 | int i; | 2520 | int i; |
2520 | struct nlattr *stats; | 2521 | struct nlattr *stats; |
@@ -2580,7 +2581,7 @@ msg_full: | |||
2580 | } | 2581 | } |
2581 | 2582 | ||
2582 | /* Caller should hold appropriate locks to protect the link */ | 2583 | /* Caller should hold appropriate locks to protect the link */ |
2583 | int __tipc_nl_add_link(struct tipc_nl_msg *msg, struct tipc_link *link) | 2584 | static int __tipc_nl_add_link(struct tipc_nl_msg *msg, struct tipc_link *link) |
2584 | { | 2585 | { |
2585 | int err; | 2586 | int err; |
2586 | void *hdr; | 2587 | void *hdr; |
@@ -2649,8 +2650,9 @@ msg_full: | |||
2649 | } | 2650 | } |
2650 | 2651 | ||
2651 | /* Caller should hold node lock */ | 2652 | /* Caller should hold node lock */ |
2652 | int __tipc_nl_add_node_links(struct tipc_nl_msg *msg, struct tipc_node *node, | 2653 | static int __tipc_nl_add_node_links(struct tipc_nl_msg *msg, |
2653 | u32 *prev_link) | 2654 | struct tipc_node *node, |
2655 | u32 *prev_link) | ||
2654 | { | 2656 | { |
2655 | u32 i; | 2657 | u32 i; |
2656 | int err; | 2658 | int err; |
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c index 30ca8e0e0f84..7cfb7a4aa58f 100644 --- a/net/tipc/name_table.c +++ b/net/tipc/name_table.c | |||
@@ -1002,8 +1002,9 @@ void tipc_nametbl_stop(void) | |||
1002 | write_unlock_bh(&tipc_nametbl_lock); | 1002 | write_unlock_bh(&tipc_nametbl_lock); |
1003 | } | 1003 | } |
1004 | 1004 | ||
1005 | int __tipc_nl_add_nametable_publ(struct tipc_nl_msg *msg, struct name_seq *seq, | 1005 | static int __tipc_nl_add_nametable_publ(struct tipc_nl_msg *msg, |
1006 | struct sub_seq *sseq, u32 *last_publ) | 1006 | struct name_seq *seq, |
1007 | struct sub_seq *sseq, u32 *last_publ) | ||
1007 | { | 1008 | { |
1008 | void *hdr; | 1009 | void *hdr; |
1009 | struct nlattr *attrs; | 1010 | struct nlattr *attrs; |
@@ -1071,8 +1072,8 @@ msg_full: | |||
1071 | return -EMSGSIZE; | 1072 | return -EMSGSIZE; |
1072 | } | 1073 | } |
1073 | 1074 | ||
1074 | int __tipc_nl_subseq_list(struct tipc_nl_msg *msg, struct name_seq *seq, | 1075 | static int __tipc_nl_subseq_list(struct tipc_nl_msg *msg, struct name_seq *seq, |
1075 | u32 *last_lower, u32 *last_publ) | 1076 | u32 *last_lower, u32 *last_publ) |
1076 | { | 1077 | { |
1077 | struct sub_seq *sseq; | 1078 | struct sub_seq *sseq; |
1078 | struct sub_seq *sseq_start; | 1079 | struct sub_seq *sseq_start; |
@@ -1098,8 +1099,8 @@ int __tipc_nl_subseq_list(struct tipc_nl_msg *msg, struct name_seq *seq, | |||
1098 | return 0; | 1099 | return 0; |
1099 | } | 1100 | } |
1100 | 1101 | ||
1101 | int __tipc_nl_seq_list(struct tipc_nl_msg *msg, u32 *last_type, u32 *last_lower, | 1102 | static int __tipc_nl_seq_list(struct tipc_nl_msg *msg, u32 *last_type, |
1102 | u32 *last_publ) | 1103 | u32 *last_lower, u32 *last_publ) |
1103 | { | 1104 | { |
1104 | struct hlist_head *seq_head; | 1105 | struct hlist_head *seq_head; |
1105 | struct name_seq *seq; | 1106 | struct name_seq *seq; |
diff --git a/net/tipc/node.c b/net/tipc/node.c index 72a75d4838b2..82e5edddc376 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c | |||
@@ -609,7 +609,7 @@ void tipc_node_unlock(struct tipc_node *node) | |||
609 | } | 609 | } |
610 | 610 | ||
611 | /* Caller should hold node lock for the passed node */ | 611 | /* Caller should hold node lock for the passed node */ |
612 | int __tipc_nl_add_node(struct tipc_nl_msg *msg, struct tipc_node *node) | 612 | static int __tipc_nl_add_node(struct tipc_nl_msg *msg, struct tipc_node *node) |
613 | { | 613 | { |
614 | void *hdr; | 614 | void *hdr; |
615 | struct nlattr *attrs; | 615 | struct nlattr *attrs; |
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index e91809182c28..6aa8c6a1ab10 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
@@ -2811,7 +2811,7 @@ void tipc_socket_stop(void) | |||
2811 | } | 2811 | } |
2812 | 2812 | ||
2813 | /* Caller should hold socket lock for the passed tipc socket. */ | 2813 | /* Caller should hold socket lock for the passed tipc socket. */ |
2814 | int __tipc_nl_add_sk_con(struct sk_buff *skb, struct tipc_sock *tsk) | 2814 | static int __tipc_nl_add_sk_con(struct sk_buff *skb, struct tipc_sock *tsk) |
2815 | { | 2815 | { |
2816 | u32 peer_node; | 2816 | u32 peer_node; |
2817 | u32 peer_port; | 2817 | u32 peer_port; |
@@ -2846,8 +2846,8 @@ msg_full: | |||
2846 | } | 2846 | } |
2847 | 2847 | ||
2848 | /* Caller should hold socket lock for the passed tipc socket. */ | 2848 | /* Caller should hold socket lock for the passed tipc socket. */ |
2849 | int __tipc_nl_add_sk(struct sk_buff *skb, struct netlink_callback *cb, | 2849 | static int __tipc_nl_add_sk(struct sk_buff *skb, struct netlink_callback *cb, |
2850 | struct tipc_sock *tsk) | 2850 | struct tipc_sock *tsk) |
2851 | { | 2851 | { |
2852 | int err; | 2852 | int err; |
2853 | void *hdr; | 2853 | void *hdr; |
@@ -2912,8 +2912,9 @@ int tipc_nl_sk_dump(struct sk_buff *skb, struct netlink_callback *cb) | |||
2912 | } | 2912 | } |
2913 | 2913 | ||
2914 | /* Caller should hold socket lock for the passed tipc socket. */ | 2914 | /* Caller should hold socket lock for the passed tipc socket. */ |
2915 | int __tipc_nl_add_sk_publ(struct sk_buff *skb, struct netlink_callback *cb, | 2915 | static int __tipc_nl_add_sk_publ(struct sk_buff *skb, |
2916 | struct publication *publ) | 2916 | struct netlink_callback *cb, |
2917 | struct publication *publ) | ||
2917 | { | 2918 | { |
2918 | void *hdr; | 2919 | void *hdr; |
2919 | struct nlattr *attrs; | 2920 | struct nlattr *attrs; |
@@ -2950,8 +2951,9 @@ msg_cancel: | |||
2950 | } | 2951 | } |
2951 | 2952 | ||
2952 | /* Caller should hold socket lock for the passed tipc socket. */ | 2953 | /* Caller should hold socket lock for the passed tipc socket. */ |
2953 | int __tipc_nl_list_sk_publ(struct sk_buff *skb, struct netlink_callback *cb, | 2954 | static int __tipc_nl_list_sk_publ(struct sk_buff *skb, |
2954 | struct tipc_sock *tsk, u32 *last_publ) | 2955 | struct netlink_callback *cb, |
2956 | struct tipc_sock *tsk, u32 *last_publ) | ||
2955 | { | 2957 | { |
2956 | int err; | 2958 | int err; |
2957 | struct publication *p; | 2959 | struct publication *p; |