diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-05-26 20:50:42 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-05-26 20:50:42 +0000 |
| commit | 6babe9805998e05466af389e63ef989373502792 (patch) | |
| tree | e8ec3db39263318b0fce465af9c6020cf539dfad /sys/netinet | |
| parent | 7e3471596909992be5f7747e1b0f148ad84a1cb6 (diff) | |
rename jumbo mtu to if_hardmtu; ok brad reyk
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/in.h | 7 | ||||
| -rw-r--r-- | sys/netinet/ip_output.c | 12 |
2 files changed, 9 insertions, 10 deletions
diff --git a/sys/netinet/in.h b/sys/netinet/in.h index a24968ca1e4..e9cf72408b8 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in.h,v 1.68 2005/10/05 17:32:22 norby Exp $ */ +/* $OpenBSD: in.h,v 1.69 2006/05/26 20:50:41 deraadt Exp $ */ /* $NetBSD: in.h,v 1.20 1996/02/13 23:41:47 christos Exp $ */ /* @@ -311,11 +311,6 @@ struct ip_mreq { #define INET_ADDRSTRLEN 16 /* - * JUMBO MTU - */ -#define IP_JUMBO_MTU 9000 - -/* * Definitions for inet sysctl operations. * * Third level is protocol number. diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index a811e011339..ee15bd2cd43 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_output.c,v 1.176 2006/03/05 21:48:56 miod Exp $ */ +/* $OpenBSD: ip_output.c,v 1.177 2006/05/26 20:50:41 deraadt Exp $ */ /* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */ /* @@ -693,9 +693,13 @@ sendit: } #endif - /* Try to use jumbograms? */ - if (flags & IP_JUMBO && ro->ro_rt && ro->ro_rt->rt_flags & RTF_JUMBO) - mtu = IP_JUMBO_MTU; + /* 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. |