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

Commit a06a2d37 authored by Wu Fengguang's avatar Wu Fengguang Committed by David S. Miller
Browse files

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?
net/ipv6/ping.c:201:5: sparse: symbol 'ping_v6_seq_show' was not declared. Should it be static?

Signed-off-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8c367fcb

net/ipv4/ping.c

+4 −4
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ void ping_close(struct sock *sk, long timeout) 
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, struct inet_sock *isk, 
	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, struct sockaddr *saddr) 
	}

}



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
Original line number Diff line number Diff line
@@ -57,22 +57,22 @@ static struct inet_protosw pingv6_protosw = { 




/* 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;
@@ -198,7 +198,7 @@ static void *ping_v6_seq_start(struct seq_file *seq, loff_t *pos) 
	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);