remove IP_JUMBO, SO_JUMBO, and RTF_JUMBO.

no objection from mcbride@ krw@ markus@ deraadt@

7 files changed, 10 insertions, 24 deletions

diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index f2070f6b35a..5375e11220d 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_socket.c,v 1.96 2012/03/14 21:27:01 kettenis Exp $	*/
+/*	$OpenBSD: uipc_socket.c,v 1.97 2012/03/17 10:16:41 dlg Exp $	*/
 /*	$NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $	*/
 
 /*
@@ -1390,7 +1390,6 @@ sosetopt(struct socket *so, int level, int optname, struct mbuf *m0)
 		case SO_REUSEADDR:
 		case SO_REUSEPORT:
 		case SO_OOBINLINE:
-		case SO_JUMBO:
 		case SO_TIMESTAMP:
 			if (m == NULL || m->m_len < sizeof (int)) {
 				error = EINVAL;
@@ -1569,7 +1568,6 @@ sogetopt(struct socket *so, int level, int optname, struct mbuf **mp)
 		case SO_REUSEPORT:
 		case SO_BROADCAST:
 		case SO_OOBINLINE:
-		case SO_JUMBO:
 		case SO_TIMESTAMP:
 			*mtod(m, int *) = so->so_options & optname;
 			break;
diff --git a/sys/net/route.h b/sys/net/route.h
index 2095a373d2b..de2ea27be6a 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.h,v 1.75 2010/10/28 17:18:35 claudio Exp $	*/
+/*	$OpenBSD: route.h,v 1.76 2012/03/17 10:16:41 dlg Exp $	*/
 /*	$NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $	*/
 
 /*
@@ -144,12 +144,11 @@ struct rtentry {
 #define RTF_PROTO1	0x8000		/* protocol specific routing flag */
 #define RTF_CLONED	0x10000		/* this is a cloned route */
 #define RTF_MPATH	0x40000		/* multipath route or operation */
-#define RTF_JUMBO	0x80000		/* try to use jumbo frames */
 #define RTF_MPLS	0x100000	/* MPLS additional infos */
 
 /* mask of RTF flags that are allowed to be modified by RTM_CHANGE */
 #define RTF_FMASK	\
-    (RTF_JUMBO | RTF_PROTO1 | RTF_PROTO2 | RTF_PROTO3 | RTF_BLACKHOLE | \
+    (RTF_PROTO1 | RTF_PROTO2 | RTF_PROTO3 | RTF_BLACKHOLE | \
      RTF_REJECT | RTF_STATIC)
 
 #ifndef _KERNEL
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 2894f72bedf..1a6b27271e3 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_output.c,v 1.225 2011/12/29 12:10:52 haesbaert Exp $	*/
+/*	$OpenBSD: ip_output.c,v 1.226 2012/03/17 10:16:41 dlg Exp $	*/
 /*	$NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $	*/
 
 /*
@@ -733,14 +733,6 @@ sendit:
 	}
 #endif
 
-	/* XXX
-	 * Try to use jumbograms based on socket option, or the route
-	 * or... for other reasons later on. 
-	 */
-	if ((flags & IP_JUMBO) && ro->ro_rt && (ro->ro_rt->rt_flags & RTF_JUMBO) &&
-	    ro->ro_rt->rt_ifp)
-		mtu = ro->ro_rt->rt_ifp->if_hardmtu;
-
 	/*
 	 * If small enough for interface, can just send directly.
 	 */
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index 045304469bd..9fe0fdf817c 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_var.h,v 1.42 2011/04/19 03:47:29 dlg Exp $	*/
+/*	$OpenBSD: ip_var.h,v 1.43 2012/03/17 10:16:41 dlg Exp $	*/
 /*	$NetBSD: ip_var.h,v 1.16 1996/02/13 23:43:20 christos Exp $	*/
 
 /*
@@ -141,7 +141,6 @@ struct	ipstat {
 #define	IP_RAWOUTPUT		0x2		/* raw ip header exists */
 #define	IP_ROUTETOIF		SO_DONTROUTE	/* bypass routing tables */
 #define	IP_ALLOWBROADCAST	SO_BROADCAST	/* can send broadcast packets */
-#define IP_JUMBO		SO_JUMBO	/* try to use the jumbo mtu */
 #define	IP_MTUDISC		0x0800		/* pmtu discovery, set DF */
 #define IP_ROUTETOETHER		0x1000		/* ether addresses given */
 
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index 56fec6b6ad1..91b445d966e 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: raw_ip.c,v 1.60 2011/07/04 17:35:01 yasuoka Exp $	*/
+/*	$OpenBSD: raw_ip.c,v 1.61 2012/03/17 10:16:41 dlg Exp $	*/
 /*	$NetBSD: raw_ip.c,v 1.25 1996/02/18 18:58:33 christos Exp $	*/
 
 /*
@@ -218,7 +218,7 @@ rip_output(struct mbuf *m, ...)
 	va_end(ap);
 
 	inp = sotoinpcb(so);
-	flags = (so->so_options & (SO_DONTROUTE|SO_JUMBO)) | IP_ALLOWBROADCAST;
+	flags = (so->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST;
 
 	/*
 	 * If the user handed us a complete IP packet, use it.
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index b3fd28f017e..460711190e2 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udp_usrreq.c,v 1.145 2011/07/08 18:30:17 yasuoka Exp $	*/
+/*	$OpenBSD: udp_usrreq.c,v 1.146 2012/03/17 10:16:41 dlg Exp $	*/
 /*	$NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $	*/
 
 /*
@@ -1034,8 +1034,7 @@ udp_output(struct mbuf *m, ...)
 	m->m_pkthdr.rdomain = inp->inp_rtableid;
 
 	error = ip_output(m, inp->inp_options, &inp->inp_route,
-	    inp->inp_socket->so_options &
-	    (SO_DONTROUTE | SO_BROADCAST | SO_JUMBO),
+	    inp->inp_socket->so_options & (SO_DONTROUTE | SO_BROADCAST),
 	    inp->inp_moptions, inp);
 	if (error == EACCES)	/* translate pf(4) error for userland */
 		error = EHOSTUNREACH;
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index 0446c0cb9e9..9cb4adf13a0 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: socket.h,v 1.78 2011/12/03 12:38:30 fgsch Exp $	*/
+/*	$OpenBSD: socket.h,v 1.79 2012/03/17 10:16:41 dlg Exp $	*/
 /*	$NetBSD: socket.h,v 1.14 1996/02/09 18:25:36 christos Exp $	*/
 
 /*
@@ -66,7 +66,6 @@
 #define	SO_LINGER	0x0080		/* linger on close if data present */
 #define	SO_OOBINLINE	0x0100		/* leave received OOB data in line */
 #define	SO_REUSEPORT	0x0200		/* allow local address & port reuse */
-#define SO_JUMBO	0x0400		/* try to use jumbograms */
 #define SO_TIMESTAMP	0x0800		/* timestamp received dgram traffic */
 #define SO_BINDANY	0x1000		/* allow bind to any address */