projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net ipv4: Convert ipv4.ip_local_port_range to be per netns v3
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
net
/
ipv4
/
ping.c
diff --git
a/net/ipv4/ping.c
b/net/ipv4/ping.c
index
d7d9882
..
a626104
100644
(file)
--- a/
net/ipv4/ping.c
+++ b/
net/ipv4/ping.c
@@
-237,11
+237,11
@@
static void inet_get_ping_group_range_net(struct net *net, kgid_t *low,
unsigned int seq;
do {
unsigned int seq;
do {
- seq = read_seqbegin(&sysctl_local_ports.lock);
+ seq = read_seqbegin(&
net->ipv4.
sysctl_local_ports.lock);
*low = data[0];
*high = data[1];
*low = data[0];
*high = data[1];
- } while (read_seqretry(&sysctl_local_ports.lock, seq));
+ } while (read_seqretry(&
net->ipv4.
sysctl_local_ports.lock, seq));
}
}
@@
-713,6
+713,8
@@
int ping_v4_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
ipc.opt = NULL;
ipc.oif = sk->sk_bound_dev_if;
ipc.tx_flags = 0;
ipc.opt = NULL;
ipc.oif = sk->sk_bound_dev_if;
ipc.tx_flags = 0;
+ ipc.ttl = 0;
+ ipc.tos = -1;
sock_tx_timestamp(sk, &ipc.tx_flags);
sock_tx_timestamp(sk, &ipc.tx_flags);
@@
-744,7
+746,7
@@
int ping_v4_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
return -EINVAL;
faddr = ipc.opt->opt.faddr;
}
return -EINVAL;
faddr = ipc.opt->opt.faddr;
}
- tos =
RT_TOS(inet->tos
);
+ tos =
get_rttos(&ipc, inet
);
if (sock_flag(sk, SOCK_LOCALROUTE) ||
(msg->msg_flags & MSG_DONTROUTE) ||
(ipc.opt && ipc.opt->opt.is_strictroute)) {
if (sock_flag(sk, SOCK_LOCALROUTE) ||
(msg->msg_flags & MSG_DONTROUTE) ||
(ipc.opt && ipc.opt->opt.is_strictroute)) {