Skip to contentSkip to conversation

PATCH [net-next-2.6] IP: Cleanups

PATCH Applied John Dykstra 2 participants 2 messages Oct 19, 2009 – Oct 20, 2009

Subsystems (3)
Networking Network drivers IPv4/IPv6
lore
Share & tools
lore

John Dykstra

author
#0 lore raw

I've been sitting on these waiting to accumulate more, but that isn't likely to happen short-term.

---
Use symbols instead of magic constants while checking PMTU discovery setsockopt.

Remove redundant test in ip_rt_frag_needed() (done by caller).

Signed-off-by John Dykstra <[email protected]>
---
 net/ipv4/ip_sockglue.c   |    2 +-
 net/ipv4/route.c         |    3 ---
 net/ipv6/ipv6_sockglue.c |    2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)
net/ipv4/ip_sockglue.c +1 -1
index c602d98..2445fed 100644
@@ -575,7 +575,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
 		inet->hdrincl = val ? 1 : 0;
 		break;
 	case IP_MTU_DISCOVER:
-		if (val < 0 || val > 3)
+		if (val < IP_PMTUDISC_DONT || val > IP_PMTUDISC_PROBE)
 			goto e_inval;
 		inet->pmtudisc = val;
 		break;
net/ipv6/ipv6_sockglue.c +1 -1
index 39e10ac..68566de 100644
@@ -662,7 +662,7 @@ done:
 	case IPV6_MTU_DISCOVER:
 		if (optlen < sizeof(int))
 			goto e_inval;
-		if (val<0 || val>3)
+		if (val < IP_PMTUDISC_DONT || val > IP_PMTUDISC_PROBE)
 			goto e_inval;
 		np->pmtudisc = val;
 		retv = 0;
net/ipv4/route.c +0 -3
index bb41992..68fb227 100644
@@ -1628,9 +1628,6 @@ unsigned short ip_rt_frag_needed(struct net *net, struct iphdr *iph,
 	__be32  daddr = iph->daddr;
 	unsigned short est_mtu = 0;
 
-	if (ipv4_config.no_pmtu_disc)
-		return 0;
-
 	for (k = 0; k < 2; k++) {
 		for (i = 0; i < 2; i++) {
 			unsigned hash = rt_hash(daddr, skeys[i], ikeys[k],--

1.5.4.3

maintainer Applied
#1 lore raw

From: John Dykstra <[email protected]>
Date: Mon, 19 Oct 2009 14:31:30 -0500

Quoted 6 lines

Use symbols instead of magic constants while checking PMTU discovery setsockopt.

Remove redundant test in ip_rt_frag_needed() (done by caller).

Signed-off-by John Dykstra <[email protected]>

Applied to net-next-2.6, thanks.