diff options
| author | hrs <hrs@FreeBSD.org> | 2014-10-05 02:34:21 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2014-10-05 02:34:21 +0000 |
| commit | 2edb8f7e2ff6f7d9746a208b04153ea81adb9708 (patch) | |
| tree | 77c6b3942a56a5c890e4b5735beedc665175ad41 /sys/net/if_lagg.h | |
| parent | 698b28701498cf0ab39073ad9e2f188726845aab (diff) | |
| download | FreeBSD-src-2edb8f7e2ff6f7d9746a208b04153ea81adb9708.zip FreeBSD-src-2edb8f7e2ff6f7d9746a208b04153ea81adb9708.tar.gz | |
- Move L2 addr configuration for the primary port to a taskqueue. This fixes
LOR of softc rmlock in iflladdr_event handlers.
- Call if_delmulti_ifma() after LACP_UNLOCK(). This fixes another LOR.
- Fix a panic in lacp_transit_expire().
- Fix a panic in lagg_input() upon shutting down a port.
Diffstat (limited to 'sys/net/if_lagg.h')
| -rw-r--r-- | sys/net/if_lagg.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/net/if_lagg.h b/sys/net/if_lagg.h index bbb3497..e86ed06 100644 --- a/sys/net/if_lagg.h +++ b/sys/net/if_lagg.h @@ -159,6 +159,9 @@ struct lagg_reqopts { #define SIOCGLAGGOPTS _IOWR('i', 152, struct lagg_reqopts) #define SIOCSLAGGOPTS _IOW('i', 153, struct lagg_reqopts) +#define LAGG_OPT_BITS "\020\001USE_FLOWID\005LACP_STRICT" \ + "\006LACP_TXTEST\007LACP_RXTEST" + #ifdef _KERNEL /* @@ -203,6 +206,7 @@ struct lagg_mc { struct lagg_llq { struct ifnet *llq_ifp; uint8_t llq_lladdr[ETHER_ADDR_LEN]; + uint8_t llq_primary; SLIST_ENTRY(lagg_llq) llq_entries; }; |
