BSD 4_3_Reno release

[unix-history] / usr / src / sys / net / if.h

diff --git a/usr/src/sys/net/if.h b/usr/src/sys/net/if.h
index 1172e3f..72a3976 100644 (file)
--- a/usr/src/sys/net/if.h
+++ b/usr/src/sys/net/if.h
@@ -2,19 +2,22 @@
  * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution is only permitted until one year after the first shipment
+ * of 4.4BSD by the Regents.  Otherwise, redistribution and use in source and
+ * binary forms are permitted provided that: (1) source distributions retain
+ * this entire copyright notice and comment, and (2) distributions including
+ * binaries display the following acknowledgement:  This product includes
+ * software developed by the University of California, Berkeley and its
+ * contributors'' in the documentation or other materials provided with the
+ * distribution and in all advertising materials mentioning features or use
+ * of this software.  Neither the name of the University nor the names of
+ * its contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  *
  *

- *     @(#)if.h        7.7 (Berkeley) %G%
+ *     @(#)if.h        7.9 (Berkeley) 6/28/90

  */
 
 /*
  */
 
 /*


@@ -127,16 +130,16 @@ struct ifnet {
 #define        IF_QFULL(ifq)           ((ifq)->ifq_len >= (ifq)->ifq_maxlen)
 #define        IF_DROP(ifq)            ((ifq)->ifq_drops++)
 #define        IF_ENQUEUE(ifq, m) { \
 #define        IF_QFULL(ifq)           ((ifq)->ifq_len >= (ifq)->ifq_maxlen)
 #define        IF_DROP(ifq)            ((ifq)->ifq_drops++)
 #define        IF_ENQUEUE(ifq, m) { \

-       (m)->m_act = 0; \
+       (m)->m_nextpkt = 0; \

        if ((ifq)->ifq_tail == 0) \
                (ifq)->ifq_head = m; \
        else \
        if ((ifq)->ifq_tail == 0) \
                (ifq)->ifq_head = m; \
        else \

-               (ifq)->ifq_tail->m_act = m; \
+               (ifq)->ifq_tail->m_nextpkt = m; \

        (ifq)->ifq_tail = m; \
        (ifq)->ifq_len++; \
 }
 #define        IF_PREPEND(ifq, m) { \
        (ifq)->ifq_tail = m; \
        (ifq)->ifq_len++; \
 }
 #define        IF_PREPEND(ifq, m) { \

-       (m)->m_act = (ifq)->ifq_head; \
+       (m)->m_nextpkt = (ifq)->ifq_head; \

        if ((ifq)->ifq_tail == 0) \
                (ifq)->ifq_tail = (m); \
        (ifq)->ifq_head = (m); \
        if ((ifq)->ifq_tail == 0) \
                (ifq)->ifq_tail = (m); \
        (ifq)->ifq_head = (m); \


@@ -145,9 +148,9 @@ struct ifnet {
 #define        IF_DEQUEUE(ifq, m) { \
        (m) = (ifq)->ifq_head; \
        if (m) { \
 #define        IF_DEQUEUE(ifq, m) { \
        (m) = (ifq)->ifq_head; \
        if (m) { \

-               if (((ifq)->ifq_head = (m)->m_act) == 0) \
+               if (((ifq)->ifq_head = (m)->m_nextpkt) == 0) \

                        (ifq)->ifq_tail = 0; \
                        (ifq)->ifq_tail = 0; \

-               (m)->m_act = 0; \
+               (m)->m_nextpkt = 0; \

                (ifq)->ifq_len--; \
        } \
 }
                (ifq)->ifq_len--; \
        } \
 }