Deleted Added
full compact
if_ethersubr.c (227293) if_ethersubr.c (228571)
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

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

22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * @(#)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

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

22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93
30 * $FreeBSD: head/sys/net/if_ethersubr.c 227293 2011-11-07 06:44:47Z ed $
30 * $FreeBSD: head/sys/net/if_ethersubr.c 228571 2011-12-16 12:16:56Z glebius $
31 */
32
33#include "opt_atalk.h"
34#include "opt_inet.h"
35#include "opt_inet6.h"
36#include "opt_ipx.h"
37#include "opt_netgraph.h"
38#include "opt_mbuf_profiling.h"

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

392 */
393 if (ifp->if_bridge) {
394 BRIDGE_OUTPUT(ifp, m, error);
395 return (error);
396 }
397
398#if defined(INET) || defined(INET6)
399 if (ifp->if_carp &&
31 */
32
33#include "opt_atalk.h"
34#include "opt_inet.h"
35#include "opt_inet6.h"
36#include "opt_ipx.h"
37#include "opt_netgraph.h"
38#include "opt_mbuf_profiling.h"

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

392 */
393 if (ifp->if_bridge) {
394 BRIDGE_OUTPUT(ifp, m, error);
395 return (error);
396 }
397
398#if defined(INET) || defined(INET6)
399 if (ifp->if_carp &&
400 (error = (*carp_output_p)(ifp, m, dst, NULL)))
400 (error = (*carp_output_p)(ifp, m, dst)))
401 goto bad;
402#endif
403
404 /* Handle ng_ether(4) processing, if any */
405 if (IFP2AC(ifp)->ac_netgraph != NULL) {
406 KASSERT(ng_ether_output_p != NULL,
407 ("ng_ether_output_p is NULL"));
408 if ((error = (*ng_ether_output_p)(ifp, &m)) != 0) {

--- 997 unchanged lines hidden ---
401 goto bad;
402#endif
403
404 /* Handle ng_ether(4) processing, if any */
405 if (IFP2AC(ifp)->ac_netgraph != NULL) {
406 KASSERT(ng_ether_output_p != NULL,
407 ("ng_ether_output_p is NULL"));
408 if ((error = (*ng_ether_output_p)(ifp, &m)) != 0) {

--- 997 unchanged lines hidden ---