diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-07-17 18:06:00 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-07-17 18:06:00 +0000 |
| commit | 61defaf160ccb9951ce024cfce5e47affb242cfc (patch) | |
| tree | 94677a8d4a30c3190015ba868d471505c2e77ca0 /sys/net/if_gif.h | |
| parent | a59e4a9588a394d5d8f491c9887322a9e5b03b3b (diff) | |
Explicitly do EtherIP encapsulation in bridge_ifenqueue().
The way gif(4) and bridge(4) are plugged together is disgusting but at
least this makes the layer violation obvious.
Fix a regression introduced by the M_PROTO1 loop prevention cleaning
because gif(4) was abusing this flag to figure out if the packet was
coming from a bridge(4).
Thanks to goda@ for finding this!
ok goda@, claudio@
Diffstat (limited to 'sys/net/if_gif.h')
| -rw-r--r-- | sys/net/if_gif.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/net/if_gif.h b/sys/net/if_gif.h index df3d52ce604..563fd70f1aa 100644 --- a/sys/net/if_gif.h +++ b/sys/net/if_gif.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gif.h,v 1.12 2015/07/16 21:21:49 mpi Exp $ */ +/* $OpenBSD: if_gif.h,v 1.13 2015/07/17 18:05:59 mpi Exp $ */ /* $KAME: if_gif.h,v 1.17 2000/09/11 11:36:41 sumikawa Exp $ */ /* @@ -47,4 +47,6 @@ struct gif_softc { extern LIST_HEAD(gif_softc_head, gif_softc) gif_softc_list; +int gif_encap(struct ifnet *, struct mbuf **, sa_family_t); + #endif /* _NET_IF_GIF_H_ */ |