get rid of obsolete structures and allow timer-setting routines to be macros

[unix-history] / usr / src / sys / netiso / clnp_er.c

diff --git a/usr/src/sys/netiso/clnp_er.c b/usr/src/sys/netiso/clnp_er.c
index 6265cba..4b76ae7 100644 (file)
--- a/usr/src/sys/netiso/clnp_er.c
+++ b/usr/src/sys/netiso/clnp_er.c
@@ -1,3 +1,12 @@
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ *
+ *     @(#)clnp_er.c   7.7 (Berkeley) %G%
+ */
+

 /***********************************************************
                Copyright IBM Corporation 1987
 
 /***********************************************************
                Copyright IBM Corporation 1987
 


@@ -26,11 +35,6 @@ SOFTWARE.
  */
 /* $Header: /var/src/sys/netiso/RCS/clnp_er.c,v 5.1 89/02/09 16:20:18 hagens Exp $ */
 /* $Source: /var/src/sys/netiso/RCS/clnp_er.c,v $ */
  */
 /* $Header: /var/src/sys/netiso/RCS/clnp_er.c,v 5.1 89/02/09 16:20:18 hagens Exp $ */
 /* $Source: /var/src/sys/netiso/RCS/clnp_er.c,v $ */

-/*     @(#)clnp_er.c   7.5 (Berkeley) %G% */
-
-#ifndef lint
-static char *rcsid = "$Header: /var/src/sys/netiso/RCS/clnp_er.c,v 5.1 89/02/09 16:20:18 hagens Exp $";
-#endif lint

 
 #include "param.h"
 #include "mbuf.h"
 
 #include "param.h"
 #include "mbuf.h"


@@ -100,7 +104,7 @@ u_char                      reason; /* reason code of er */
                        cmd = PRC_PARAMPROB;
                        break;
                case GEN_SEGNEEDED:             
                        cmd = PRC_PARAMPROB;
                        break;
                case GEN_SEGNEEDED:             

-                       cmd = PRC_UNREACH_NEEDFRAG; 
+                       cmd = PRC_MSGSIZE; 

                        break;
                case GEN_INCOMPLETE:    
                        cmd = PRC_PARAMPROB;            
                        break;
                case GEN_INCOMPLETE:    
                        cmd = PRC_PARAMPROB;            


@@ -320,7 +324,7 @@ char                                        reason; /* reason for discard */
        
        /* send packet */
        INCSTAT(cns_er_outhist[clnp_er_index(reason)]);
        
        /* send packet */
        INCSTAT(cns_er_outhist[clnp_er_index(reason)]);

-       (void) (*ifp->if_output)(ifp, m0, first_hop);
+       (void) (*ifp->if_output)(ifp, m0, first_hop, route.ro_rt);

        goto done;
 
 bad:
        goto done;
 
 bad: