Deleted Added
full compact
if_ethersubr.c (113950) if_ethersubr.c (114293)
1/*
2 * Copyright (c) 1982, 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93
1/*
2 * Copyright (c) 1982, 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93
34 * $FreeBSD: head/sys/net/if_ethersubr.c 113950 2003-04-23 23:45:57Z archie $
34 * $FreeBSD: head/sys/net/if_ethersubr.c 114293 2003-04-30 12:57:40Z markm $
35 */
36
37#include "opt_atalk.h"
38#include "opt_inet.h"
39#include "opt_inet6.h"
40#include "opt_ipx.h"
41#include "opt_bdg.h"
42#include "opt_mac.h"

--- 54 unchanged lines hidden (view full) ---

97
98/* netgraph node hooks for ng_ether(4) */
99void (*ng_ether_input_p)(struct ifnet *ifp, struct mbuf **mp);
100void (*ng_ether_input_orphan_p)(struct ifnet *ifp, struct mbuf *m);
101int (*ng_ether_output_p)(struct ifnet *ifp, struct mbuf **mp);
102void (*ng_ether_attach_p)(struct ifnet *ifp);
103void (*ng_ether_detach_p)(struct ifnet *ifp);
104
35 */
36
37#include "opt_atalk.h"
38#include "opt_inet.h"
39#include "opt_inet6.h"
40#include "opt_ipx.h"
41#include "opt_bdg.h"
42#include "opt_mac.h"

--- 54 unchanged lines hidden (view full) ---

97
98/* netgraph node hooks for ng_ether(4) */
99void (*ng_ether_input_p)(struct ifnet *ifp, struct mbuf **mp);
100void (*ng_ether_input_orphan_p)(struct ifnet *ifp, struct mbuf *m);
101int (*ng_ether_output_p)(struct ifnet *ifp, struct mbuf **mp);
102void (*ng_ether_attach_p)(struct ifnet *ifp);
103void (*ng_ether_detach_p)(struct ifnet *ifp);
104
105void (*vlan_input_p)(struct ifnet *, struct mbuf *);
105static void (*vlan_input_p)(struct ifnet *, struct mbuf *);
106
107/* bridge support */
108int do_bridge;
109bridge_in_t *bridge_in_ptr;
110bdg_forward_t *bdg_forward_ptr;
111bdgtakeifaces_t *bdgtakeifaces_ptr;
112struct bdg_softc *ifp2sc;
113

--- 929 unchanged lines hidden ---
106
107/* bridge support */
108int do_bridge;
109bridge_in_t *bridge_in_ptr;
110bdg_forward_t *bdg_forward_ptr;
111bdgtakeifaces_t *bdgtakeifaces_ptr;
112struct bdg_softc *ifp2sc;
113

--- 929 unchanged lines hidden ---