Deleted Added
full compact
if_lagg.h (203548) if_lagg.h (232008)
1/* $OpenBSD: if_trunk.h,v 1.11 2007/01/31 06:20:19 reyk Exp $ */
2
3/*
4 * Copyright (c) 2005, 2006 Reyk Floeter <reyk@openbsd.org>
5 *
6 * Permission to use, copy, modify, and distribute this software for any
7 * purpose with or without fee is hereby granted, provided that the above
8 * copyright notice and this permission notice appear in all copies.
9 *
10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 *
1/* $OpenBSD: if_trunk.h,v 1.11 2007/01/31 06:20:19 reyk Exp $ */
2
3/*
4 * Copyright (c) 2005, 2006 Reyk Floeter <reyk@openbsd.org>
5 *
6 * Permission to use, copy, modify, and distribute this software for any
7 * purpose with or without fee is hereby granted, provided that the above
8 * copyright notice and this permission notice appear in all copies.
9 *
10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 *
18 * $FreeBSD: head/sys/net/if_lagg.h 203548 2010-02-06 13:49:35Z eri $
18 * $FreeBSD: head/sys/net/if_lagg.h 232008 2012-02-22 22:01:30Z thompsa $
19 */
20
21#ifndef _NET_LAGG_H
22#define _NET_LAGG_H
23
19 */
20
21#ifndef _NET_LAGG_H
22#define _NET_LAGG_H
23
24#include <sys/sysctl.h>
25
24/*
25 * Global definitions
26 */
27
28#define LAGG_MAX_PORTS 32 /* logically */
29#define LAGG_MAX_NAMESIZE 32 /* name of a protocol */
30#define LAGG_MAX_STACKING 4 /* maximum number of stacked laggs */
31

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

197 void (*sc_stop)(struct lagg_softc *);
198 void (*sc_lladdr)(struct lagg_softc *);
199 void (*sc_req)(struct lagg_softc *, caddr_t);
200 void (*sc_portreq)(struct lagg_port *, caddr_t);
201#if __FreeBSD_version >= 800000
202 eventhandler_tag vlan_attach;
203 eventhandler_tag vlan_detach;
204#endif
26/*
27 * Global definitions
28 */
29
30#define LAGG_MAX_PORTS 32 /* logically */
31#define LAGG_MAX_NAMESIZE 32 /* name of a protocol */
32#define LAGG_MAX_STACKING 4 /* maximum number of stacked laggs */
33

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

199 void (*sc_stop)(struct lagg_softc *);
200 void (*sc_lladdr)(struct lagg_softc *);
201 void (*sc_req)(struct lagg_softc *, caddr_t);
202 void (*sc_portreq)(struct lagg_port *, caddr_t);
203#if __FreeBSD_version >= 800000
204 eventhandler_tag vlan_attach;
205 eventhandler_tag vlan_detach;
206#endif
207 struct sysctl_ctx_list ctx; /* sysctl variables */
208 int use_flowid; /* use M_FLOWID */
205};
206
207struct lagg_port {
208 struct ifnet *lp_ifp; /* physical interface */
209 struct lagg_softc *lp_softc; /* parent lagg */
210 uint8_t lp_lladdr[ETHER_ADDR_LEN];
211
212 u_char lp_iftype; /* interface type */

--- 35 unchanged lines hidden ---
209};
210
211struct lagg_port {
212 struct ifnet *lp_ifp; /* physical interface */
213 struct lagg_softc *lp_softc; /* parent lagg */
214 uint8_t lp_lladdr[ETHER_ADDR_LEN];
215
216 u_char lp_iftype; /* interface type */

--- 35 unchanged lines hidden ---