diff options
| author | Rob Johnston <rob.johnston@joyent.com> | 2020-03-31 20:23:14 +0000 |
|---|---|---|
| committer | Rob Johnston <rob.johnston@joyent.com> | 2020-03-31 20:23:14 +0000 |
| commit | 539433c5816f67f5d429b3277a36626861bb80d6 (patch) | |
| tree | 52ff8e440b5ee3555146e60001b6229f87caa70e /usr/src/uts/common/io/aggr/aggr_grp.c | |
| parent | f3d6b2aae0cdb3fba9059c897a7a5960f7cfc5f8 (diff) | |
| parent | 78a0e8a13427b21a9acb597da969a7921c521e12 (diff) | |
| download | illumos-joyent-539433c5816f67f5d429b3277a36626861bb80d6.tar.gz | |
Merge branch 'master' into denseshrimp
Diffstat (limited to 'usr/src/uts/common/io/aggr/aggr_grp.c')
| -rw-r--r-- | usr/src/uts/common/io/aggr/aggr_grp.c | 7 |
1 files changed, 4 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 9097e059b5..dc6f03b247 100644 --- a/usr/src/uts/common/io/aggr/aggr_grp.c +++ b/usr/src/uts/common/io/aggr/aggr_grp.c @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2018 Joyent, Inc. + * Copyright 2020 Joyent, Inc. */ /* @@ -753,6 +753,8 @@ aggr_add_pseudo_rx_group(aggr_port_t *port, aggr_pseudo_rx_group_t *rx_grp) ASSERT3U(g_idx, <, MAX_GROUPS_PER_PORT); mac_perim_enter_by_mh(port->lp_mh, &pmph); + i = 0; + addr = NULL; /* * This function must be called after the aggr registers its * MAC and its Rx groups have been initialized. @@ -1442,8 +1444,7 @@ aggr_grp_create(datalink_id_t linkid, uint32_t key, uint_t nports, grp->lg_rx_group_count = 1; - for (i = 0, port = grp->lg_ports; port != NULL; - i++, port = port->lp_next) { + for (port = grp->lg_ports; port != NULL; port = port->lp_next) { uint_t num_rgroups; mac_perim_enter_by_mh(port->lp_mh, &mph); |