Deleted Added
full compact
if_lagg.h (272446) if_lagg.h (272547)
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 272446 2014-10-02 20:01:13Z hrs $
18 * $FreeBSD: head/sys/net/if_lagg.h 272547 2014-10-05 02:34:21Z hrs $
19 */
20
21#ifndef _NET_LAGG_H
22#define _NET_LAGG_H
23
24/*
25 * Global definitions
26 */

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

154 u_int ro_active; /* active port count */
155 u_int ro_flapping; /* number of flapping */
156 int ro_flowid_shift; /* shift the flowid */
157};
158
159#define SIOCGLAGGOPTS _IOWR('i', 152, struct lagg_reqopts)
160#define SIOCSLAGGOPTS _IOW('i', 153, struct lagg_reqopts)
161
19 */
20
21#ifndef _NET_LAGG_H
22#define _NET_LAGG_H
23
24/*
25 * Global definitions
26 */

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

154 u_int ro_active; /* active port count */
155 u_int ro_flapping; /* number of flapping */
156 int ro_flowid_shift; /* shift the flowid */
157};
158
159#define SIOCGLAGGOPTS _IOWR('i', 152, struct lagg_reqopts)
160#define SIOCSLAGGOPTS _IOW('i', 153, struct lagg_reqopts)
161
162#define LAGG_OPT_BITS "\020\001USE_FLOWID\005LACP_STRICT" \
163 "\006LACP_TXTEST\007LACP_RXTEST"
164
162#ifdef _KERNEL
163
164/*
165 * Internal kernel part
166 */
167
168#define LAGG_PORTACTIVE(_tp) ( \
169 ((_tp)->lp_ifp->if_link_state == LINK_STATE_UP) && \

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

198 struct ifmultiaddr *mc_ifma;
199 SLIST_ENTRY(lagg_mc) mc_entries;
200};
201
202/* List of interfaces to have the MAC address modified */
203struct lagg_llq {
204 struct ifnet *llq_ifp;
205 uint8_t llq_lladdr[ETHER_ADDR_LEN];
165#ifdef _KERNEL
166
167/*
168 * Internal kernel part
169 */
170
171#define LAGG_PORTACTIVE(_tp) ( \
172 ((_tp)->lp_ifp->if_link_state == LINK_STATE_UP) && \

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

201 struct ifmultiaddr *mc_ifma;
202 SLIST_ENTRY(lagg_mc) mc_entries;
203};
204
205/* List of interfaces to have the MAC address modified */
206struct lagg_llq {
207 struct ifnet *llq_ifp;
208 uint8_t llq_lladdr[ETHER_ADDR_LEN];
209 uint8_t llq_primary;
206 SLIST_ENTRY(lagg_llq) llq_entries;
207};
208
209struct lagg_counters {
210 uint64_t val[IFCOUNTERS];
211};
212
213struct lagg_softc {

--- 71 unchanged lines hidden ---
210 SLIST_ENTRY(lagg_llq) llq_entries;
211};
212
213struct lagg_counters {
214 uint64_t val[IFCOUNTERS];
215};
216
217struct lagg_softc {

--- 71 unchanged lines hidden ---