Skip to contentSkip to conversation

net: ping_check_bind_addr() etc. can be static

PATCH Superseded Fengguang Wu 2 participants 6 messages Jun 9, 2013 – Jun 13, 2013

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Fengguang Wu

author
#0 lore raw

PATCH 1/1 net: ping_check_bind_addr() etc. can be static

net/ipv4/ping.c:286:5: sparse: symbol 'ping_check_bind_addr' was not declared. Should it be static? net/ipv4/ping.c:355:6: sparse: symbol 'ping_set_saddr' was not declared. Should it be static? net/ipv4/ping.c:370:6: sparse: symbol 'ping_clear_saddr' was not declared. Should it be static?

net/ipv6/ping.c:60:5: sparse: symbol 'dummy_ipv6_recv_error' was not declared. Should it be static? net/ipv6/ping.c:64:5: sparse: symbol 'dummy_ip6_datagram_recv_ctl' was not declared. Should it be static? net/ipv6/ping.c:69:5: sparse: symbol 'dummy_icmpv6_err_convert' was not declared. Should it be static? net/ipv6/ping.c:73:6: sparse: symbol 'dummy_ipv6_icmp_error' was not declared. Should it be static? net/ipv6/ping.c:75:5: sparse: symbol 'dummy_ipv6_chk_addr' was not declared. Should it be static?

Signed-off-by Fengguang Wu <[email protected]>
---
 net/ipv4/ping.c |    6 +++---
 net/ipv6/ping.c |   10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)
net/ipv4/ping.c +3 -3
@@ -283,7 +283,7 @@ void ping_close(struct sock *sk, long ti
 EXPORT_SYMBOL_GPL(ping_close);
 
 /* Checks the bind address and possibly modifies sk->sk_bound_dev_if. */
-int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
+static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
 			 struct sockaddr *uaddr, int addr_len) {
 	struct net *net = sock_net(sk);
 	if (sk->sk_family == AF_INET) {

@@ -352,7 +352,7 @@ int ping_check_bind_addr(struct sock *sk
 	return 0;
 }
 
-void ping_set_saddr(struct sock *sk, struct sockaddr *saddr)
+static void ping_set_saddr(struct sock *sk, struct sockaddr *saddr)
 {
 	if (saddr->sa_family == AF_INET) {
 		struct inet_sock *isk = inet_sk(sk);

@@ -367,7 +367,7 @@ void ping_set_saddr(struct sock *sk, str
 	}
 }
 
-void ping_clear_saddr(struct sock *sk, int dif)
+static void ping_clear_saddr(struct sock *sk, int dif)
 {
 	sk->sk_bound_dev_if = dif;
 	if (sk->sk_family == AF_INET) {
net/ipv6/ping.c +5 -5
@@ -57,22 +57,22 @@ static struct inet_protosw pingv6_protos
 
 
 /* Compatibility glue so we can support IPv6 when it's compiled as a module */
-int dummy_ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len)
+static int dummy_ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len)
 {
 	return -EAFNOSUPPORT;
 }
-int dummy_ip6_datagram_recv_ctl(struct sock *sk, struct msghdr *msg,
+static int dummy_ip6_datagram_recv_ctl(struct sock *sk, struct msghdr *msg,
 				 struct sk_buff *skb)
 {
 	return -EAFNOSUPPORT;
 }
-int dummy_icmpv6_err_convert(u8 type, u8 code, int *err)
+static int dummy_icmpv6_err_convert(u8 type, u8 code, int *err)
 {
 	return -EAFNOSUPPORT;
 }
-void dummy_ipv6_icmp_error(struct sock *sk, struct sk_buff *skb, int err,
+static void dummy_ipv6_icmp_error(struct sock *sk, struct sk_buff *skb, int err,
 			    __be16 port, u32 info, u8 *payload) {}
-int dummy_ipv6_chk_addr(struct net *net, const struct in6_addr *addr,
+static int dummy_ipv6_chk_addr(struct net *net, const struct in6_addr *addr,
 			const struct net_device *dev, int strict)
 {
 	return 0;
author
#1 lore raw

PATCH 1/1 net: ipv6: ping_v6_seq_show() can be static

TO: Lorenzo Colitti <[email protected]>
CC: [email protected]
CC: [email protected]

Signed-off-by Fengguang Wu <[email protected]>
---
 net/ipv6/ping.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Sorry I just realized this patch could be folded into the previous one.. It was two patches because the problems are found in two times.

net/ipv6/ping.c +1 -1
@@ -198,7 +198,7 @@ static void *ping_v6_seq_start(struct se
 	return ping_seq_start(seq, pos, AF_INET6);
 }
 
-int ping_v6_seq_show(struct seq_file *seq, void *v)
+static int ping_v6_seq_show(struct seq_file *seq, void *v)
 {
 	if (v == SEQ_START_TOKEN) {
 		seq_puts(seq, IPV6_SEQ_DGRAM_HEADER);
maintainer
#2 lore raw
In reply to Fengguang Wu

From: Fengguang Wu <[email protected]>
Date: Sun, 9 Jun 2013 20:24:26 +0800

net/ipv4/ping.c void ping_close(struct sock *sk, long ti · line 287

Quoted 4 lines

/* Checks the bind address and possibly modifies sk->sk_bound_dev_if. */

net/ipv4/ping.c +1 -1
-int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
+static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
 			 struct sockaddr *uaddr, int addr_len) {

In all of these cases, you have to fix the indentation of all of the argument lines when the change the location of the openning parenthesis of the first line of the function definition.

That's because in the networking we indent function declarations in the following way:

int foo(int arg1, int arg2, int arg3,
int arg4, int arg5)

Specifically, the arguments that are declared on the second and subsequent lines must start at the first column after the openning parenthesis. This must be done using the appropriate number of TAB and space characters necessary to achieve that exact column.

Please fix this up and combine your two patches into one.

author
#3 lore raw
Quoted 18 lines · David Miller

From: Fengguang Wu <[email protected]>
Date: Sun, 9 Jun 2013 20:24:26 +0800

net/ipv4/ping.c void ping_close(struct sock *sk, long ti · line 287

Quoted 4 lines

/* Checks the bind address and possibly modifies sk->sk_bound_dev_if. */

net/ipv4/ping.c +1 -1
-int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
+static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
 			 struct sockaddr *uaddr, int addr_len) {

In all of these cases, you have to fix the indentation of all of the argument lines when the change the location of the openning parenthesis of the first line of the function definition.

That's because in the networking we indent function declarations in the following way:

int foo(int arg1, int arg2, int arg3,
int arg4, int arg5)

Quoted 6 lines

Specifically, the arguments that are declared on the second and subsequent lines must start at the first column after the openning parenthesis. This must be done using the appropriate number of TAB and space characters necessary to achieve that exact column.

Please fix this up and combine your two patches into one.

OK I'll rework the patch, thank you for the kind tips!

Thanks,
Fengguang

author
#4 lore raw

PATCH v2 1/1 net: ping_check_bind_addr() etc. can be static

In reply to Fengguang Wu

net/ipv4/ping.c:286:5: sparse: symbol 'ping_check_bind_addr' was not declared. Should it be static? net/ipv4/ping.c:355:6: sparse: symbol 'ping_set_saddr' was not declared. Should it be static? net/ipv4/ping.c:370:6: sparse: symbol 'ping_clear_saddr' was not declared. Should it be static?

net/ipv6/ping.c:60:5: sparse: symbol 'dummy_ipv6_recv_error' was not declared. Should it be static? net/ipv6/ping.c:64:5: sparse: symbol 'dummy_ip6_datagram_recv_ctl' was not declared. Should it be static? net/ipv6/ping.c:69:5: sparse: symbol 'dummy_icmpv6_err_convert' was not declared. Should it be static? net/ipv6/ping.c:73:6: sparse: symbol 'dummy_ipv6_icmp_error' was not declared. Should it be static? net/ipv6/ping.c:75:5: sparse: symbol 'dummy_ipv6_chk_addr' was not declared. Should it be static? net/ipv6/ping.c:201:5: sparse: symbol 'ping_v6_seq_show' was not declared. Should it be static?

Signed-off-by Fengguang Wu <[email protected]>
---
 net/ipv4/ping.c |    8 ++++----
 net/ipv6/ping.c |   18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)
net/ipv4/ping.c +4 -4
@@ -283,8 +283,8 @@ void ping_close(struct sock *sk, long ti
 EXPORT_SYMBOL_GPL(ping_close);
 
 /* Checks the bind address and possibly modifies sk->sk_bound_dev_if. */
-int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
-			 struct sockaddr *uaddr, int addr_len) {
+static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
+				struct sockaddr *uaddr, int addr_len) {
 	struct net *net = sock_net(sk);
 	if (sk->sk_family == AF_INET) {
 		struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;

@@ -352,7 +352,7 @@ int ping_check_bind_addr(struct sock *sk
 	return 0;
 }
 
-void ping_set_saddr(struct sock *sk, struct sockaddr *saddr)
+static void ping_set_saddr(struct sock *sk, struct sockaddr *saddr)
 {
 	if (saddr->sa_family == AF_INET) {
 		struct inet_sock *isk = inet_sk(sk);

@@ -367,7 +367,7 @@ void ping_set_saddr(struct sock *sk, str
 	}
 }
 
-void ping_clear_saddr(struct sock *sk, int dif)
+static void ping_clear_saddr(struct sock *sk, int dif)
 {
 	sk->sk_bound_dev_if = dif;
 	if (sk->sk_family == AF_INET) {
net/ipv6/ping.c +9 -9
@@ -57,23 +57,23 @@ static struct inet_protosw pingv6_protos
 
 
 /* Compatibility glue so we can support IPv6 when it's compiled as a module */
-int dummy_ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len)
+static int dummy_ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len)
 {
 	return -EAFNOSUPPORT;
 }
-int dummy_ip6_datagram_recv_ctl(struct sock *sk, struct msghdr *msg,
-				 struct sk_buff *skb)
+static int dummy_ip6_datagram_recv_ctl(struct sock *sk, struct msghdr *msg,
+				       struct sk_buff *skb)
 {
 	return -EAFNOSUPPORT;
 }
-int dummy_icmpv6_err_convert(u8 type, u8 code, int *err)
+static int dummy_icmpv6_err_convert(u8 type, u8 code, int *err)
 {
 	return -EAFNOSUPPORT;
 }
-void dummy_ipv6_icmp_error(struct sock *sk, struct sk_buff *skb, int err,
-			    __be16 port, u32 info, u8 *payload) {}
-int dummy_ipv6_chk_addr(struct net *net, const struct in6_addr *addr,
-			const struct net_device *dev, int strict)
+static void dummy_ipv6_icmp_error(struct sock *sk, struct sk_buff *skb, int err,
+				  __be16 port, u32 info, u8 *payload) {}
+static int dummy_ipv6_chk_addr(struct net *net, const struct in6_addr *addr,
+			       const struct net_device *dev, int strict)
 {
 	return 0;
 }

@@ -198,7 +198,7 @@ static void *ping_v6_seq_start(struct se
 	return ping_seq_start(seq, pos, AF_INET6);
 }
 
-int ping_v6_seq_show(struct seq_file *seq, void *v)
+static int ping_v6_seq_show(struct seq_file *seq, void *v)
 {
 	if (v == SEQ_START_TOKEN) {
 		seq_puts(seq, IPV6_SEQ_DGRAM_HEADER);
maintainer Applied
#5 lore raw

From: Fengguang Wu <[email protected]>
Date: Wed, 12 Jun 2013 21:04:16 +0800

Quoted 4 lines

net/ipv4/ping.c:286:5: sparse: symbol 'ping_check_bind_addr' was not declared. Should it be static? net/ipv4/ping.c:355:6: sparse: symbol 'ping_set_saddr' was not declared. Should it be static? net/ipv4/ping.c:370:6: sparse: symbol 'ping_clear_saddr' was not declared. Should it be static?

Quoted 8 lines

net/ipv6/ping.c:60:5: sparse: symbol 'dummy_ipv6_recv_error' was not declared. Should it be static? net/ipv6/ping.c:64:5: sparse: symbol 'dummy_ip6_datagram_recv_ctl' was not declared. Should it be static? net/ipv6/ping.c:69:5: sparse: symbol 'dummy_icmpv6_err_convert' was not declared. Should it be static? net/ipv6/ping.c:73:6: sparse: symbol 'dummy_ipv6_icmp_error' was not declared. Should it be static? net/ipv6/ping.c:75:5: sparse: symbol 'dummy_ipv6_chk_addr' was not declared. Should it be static? net/ipv6/ping.c:201:5: sparse: symbol 'ping_v6_seq_show' was not declared. Should it be static?

Signed-off-by Fengguang Wu <[email protected]>

Applied.