diff options
| author | dg <dg@FreeBSD.org> | 1995-02-07 06:19:56 +0000 |
|---|---|---|
| committer | dg <dg@FreeBSD.org> | 1995-02-07 06:19:56 +0000 |
| commit | d07ad100e84df2dd0896b5c3f6b84f120f263e4e (patch) | |
| tree | 3310b341de3f8257da5b4e37c628ca0409023e25 /sys/net/route.h | |
| parent | 82caf4596d03519c53248b01d882eaa44de79bd6 (diff) | |
| download | FreeBSD-src-d07ad100e84df2dd0896b5c3f6b84f120f263e4e.zip FreeBSD-src-d07ad100e84df2dd0896b5c3f6b84f120f263e4e.tar.gz | |
Fixed unresolved CVS conflict on RTM_VERSION.
Diffstat (limited to 'sys/net/route.h')
| -rw-r--r-- | sys/net/route.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sys/net/route.h b/sys/net/route.h index 94b9be7..81e1a7f 100644 --- a/sys/net/route.h +++ b/sys/net/route.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)route.h 8.3 (Berkeley) 4/19/94 - * $Id: route.h,v 1.8 1995/01/24 04:47:33 bde Exp $ + * $Id: route.h,v 1.9 1995/02/07 02:01:48 wollman Exp $ */ #ifndef _NET_ROUTE_H_ @@ -184,17 +184,11 @@ struct rt_msghdr { struct rt_metrics rtm_rmx; /* metrics themselves */ }; -<<<<<<< route.h #define RTM_VERSION 5 /* Up the ante and ignore older versions */ -||||||| 1.5.4.1 -#define RTM_VERSION 3 /* Up the ante and ignore older versions */ -======= -#define RTM_VERSION 3 /* Up the ante and ignore older versions */ #ifdef TTCP #undef RTM_VERSION -#define RTM_VERSION 4 /* T/TCP requires changes in the rmx */ +#define RTM_VERSION 6 /* T/TCP requires changes in the rmx */ #endif ->>>>>>> /tmp/T4000726 #define RTM_ADD 0x1 /* Add Route */ #define RTM_DELETE 0x2 /* Delete Route */ |
