[src/netbsd-1-5]: src/sys/net Pull up revision 1.22 (via patch, requested by ...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d59ae9b53bad
branches:  netbsd-1-5
changeset: 493049:d59ae9b53bad
user:      he <he%NetBSD.org@localhost>
date:      Thu Apr 11 21:30:35 2002 +0000

description:
Pull up revision 1.22 (via patch, requested by jtk):
  Use an explicitly sized type for DLT_NULL encapsulation.
  Correct gif address family.

diffstat:

 sys/net/if_gif.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (23 lines):

diff -r 0040c942ca26 -r d59ae9b53bad sys/net/if_gif.c
--- a/sys/net/if_gif.c  Thu Apr 11 21:23:59 2002 +0000
+++ b/sys/net/if_gif.c  Thu Apr 11 21:30:35 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_gif.c,v 1.10.4.3 2000/11/19 20:21:09 tv Exp $       */
+/*     $NetBSD: if_gif.c,v 1.10.4.4 2002/04/11 21:30:35 he Exp $       */
 /*     $KAME: if_gif.c,v 1.34 2000/10/07 03:58:53 itojun Exp $ */
 
 /*
@@ -368,11 +368,11 @@
                 * try to free it or keep a pointer a to it).
                 */
                struct mbuf m0;
-               u_int af = AF_INET6;
+               u_int32_t af1 = af;
                
                m0.m_next = m;
                m0.m_len = 4;
-               m0.m_data = (char *)&af;
+               m0.m_data = (char *)&af1;
                
 #ifdef HAVE_OLD_BPF
                bpf_mtap(gifp, &m0);