projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bonding, net: Move last_rx update into bonding recv logic
[deliverable/linux.git]
/
net
/
netfilter
/
ipvs
/
ip_vs_ctl.c
diff --git
a/net/netfilter/ipvs/ip_vs_ctl.c
b/net/netfilter/ipvs/ip_vs_ctl.c
index 0302cf3e503968f5a4a2b8a89b3828b536e71871..d0ccdaff4276ae278927f07f9bdc99380f78060c 100644
(file)
--- a/
net/netfilter/ipvs/ip_vs_ctl.c
+++ b/
net/netfilter/ipvs/ip_vs_ctl.c
@@
-1168,15
+1168,9
@@
ip_vs_add_service(struct ip_vs_service_user_kern *u,
}
#ifdef CONFIG_IP_VS_IPV6
}
#ifdef CONFIG_IP_VS_IPV6
- if (u->af == AF_INET6) {
- if (!sched->supports_ipv6) {
- ret = -EAFNOSUPPORT;
- goto out_err;
- }
- if ((u->netmask < 1) || (u->netmask > 128)) {
- ret = -EINVAL;
- goto out_err;
- }
+ if (u->af == AF_INET6 && (u->netmask < 1 || u->netmask > 128)) {
+ ret = -EINVAL;
+ goto out_err;
}
#endif
}
#endif
@@
-1272,15
+1266,9
@@
ip_vs_edit_service(struct ip_vs_service *svc, struct ip_vs_service_user_kern *u)
old_sched = sched;
#ifdef CONFIG_IP_VS_IPV6
old_sched = sched;
#ifdef CONFIG_IP_VS_IPV6
- if (u->af == AF_INET6) {
- if (!sched->supports_ipv6) {
- ret = -EAFNOSUPPORT;
- goto out;
- }
- if ((u->netmask < 1) || (u->netmask > 128)) {
- ret = -EINVAL;
- goto out;
- }
+ if (u->af == AF_INET6 && (u->netmask < 1 || u->netmask > 128)) {
+ ret = -EINVAL;
+ goto out;
}
#endif
}
#endif
@@
-1867,9
+1855,9
@@
static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
if (iter->table == ip_vs_svc_table) {
#ifdef CONFIG_IP_VS_IPV6
if (svc->af == AF_INET6)
if (iter->table == ip_vs_svc_table) {
#ifdef CONFIG_IP_VS_IPV6
if (svc->af == AF_INET6)
- seq_printf(seq, "%s [
" NIP6_FMT "
]:%04X %s ",
+ seq_printf(seq, "%s [
%pI6
]:%04X %s ",
ip_vs_proto_name(svc->protocol),
ip_vs_proto_name(svc->protocol),
-
NIP6(svc->addr.in6)
,
+
&svc->addr.in6
,
ntohs(svc->port),
svc->scheduler->name);
else
ntohs(svc->port),
svc->scheduler->name);
else
@@
-1895,9
+1883,9
@@
static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
#ifdef CONFIG_IP_VS_IPV6
if (dest->af == AF_INET6)
seq_printf(seq,
#ifdef CONFIG_IP_VS_IPV6
if (dest->af == AF_INET6)
seq_printf(seq,
- " -> [
" NIP6_FMT "
]:%04X"
+ " -> [
%pI6
]:%04X"
" %-7s %-6d %-10d %-10d\n",
" %-7s %-6d %-10d %-10d\n",
-
NIP6(dest->addr.in6)
,
+
&dest->addr.in6
,
ntohs(dest->port),
ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
atomic_read(&dest->weight),
ntohs(dest->port),
ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
atomic_read(&dest->weight),
@@
-2141,8
+2129,8
@@
do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)
/* Check for valid protocol: TCP or UDP, even for fwmark!=0 */
if (usvc.protocol != IPPROTO_TCP && usvc.protocol != IPPROTO_UDP) {
/* Check for valid protocol: TCP or UDP, even for fwmark!=0 */
if (usvc.protocol != IPPROTO_TCP && usvc.protocol != IPPROTO_UDP) {
- IP_VS_ERR("set_ctl: invalid protocol: %d %
d.%d.%d.%d
:%d %s\n",
- usvc.protocol,
NIPQUAD(usvc.addr.ip)
,
+ IP_VS_ERR("set_ctl: invalid protocol: %d %
pI4
:%d %s\n",
+ usvc.protocol,
&usvc.addr.ip
,
ntohs(usvc.port), usvc.sched_name);
ret = -EFAULT;
goto out_unlock;
ntohs(usvc.port), usvc.sched_name);
ret = -EFAULT;
goto out_unlock;
This page took
0.030342 seconds
and
5
git commands to generate.