diff options
| author | Paul Winder <paul@winder.uk.net> | 2020-10-09 10:54:02 +0100 |
|---|---|---|
| committer | Paul Winder <paul@winder.uk.net> | 2020-10-13 16:07:11 +0100 |
| commit | 0a36db39c3cd88f4799ecd9db875f43d834d0a81 (patch) | |
| tree | ec6096ed066d583cb7c304f791b6ca27b3fe808f | |
| parent | 9e678d632bda8e6911719d88b7c2d44a886aba5b (diff) | |
| download | illumos-joyent-0a36db39c3cd88f4799ecd9db875f43d834d0a81.tar.gz | |
13210 Removing multiple links from aggr leaves last link dangling
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Ryan Zezeski <ryan@zinascii.com>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Reviewed by: C Fraire <cfraire@me.com>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/uts/common/io/aggr/aggr_grp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr/src/uts/common/io/aggr/aggr_grp.c b/usr/src/uts/common/io/aggr/aggr_grp.c index dc6f03b247..199625c377 100644 --- a/usr/src/uts/common/io/aggr/aggr_grp.c +++ b/usr/src/uts/common/io/aggr/aggr_grp.c @@ -21,6 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2020 Joyent, Inc. + * Copyright 2020 RackTop Systems, Inc. */ /* @@ -1749,7 +1750,8 @@ done: int aggr_grp_rem_ports(datalink_id_t linkid, uint_t nports, laioc_port_t *ports) { - int rc = 0, i; + int rc = 0; + uint_t i; aggr_grp_t *grp = NULL; aggr_port_t *port; boolean_t mac_addr_update = B_FALSE, mac_addr_changed; @@ -1842,8 +1844,8 @@ aggr_grp_rem_ports(datalink_id_t linkid, uint_t nports, laioc_port_t *ports) * aggr_find_tx_ring() will not return any rings * belonging to it. */ - for (i = 0; i < grp->lg_rx_group_count; i++) - aggr_rem_pseudo_rx_group(port, &grp->lg_rx_groups[i]); + for (uint_t j = 0; j < grp->lg_rx_group_count; j++) + aggr_rem_pseudo_rx_group(port, &grp->lg_rx_groups[j]); /* remove port from group */ rc = aggr_grp_rem_port(grp, port, &mac_addr_changed, |