diff options
| author | Hans Rosenfeld <hans.rosenfeld@nexenta.com> | 2013-01-22 12:11:15 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@nexenta.com> | 2013-01-22 13:19:58 -0500 |
| commit | b7c47e8c412d4654019e45625cf2be8f7fd6ee66 (patch) | |
| tree | 787d172f1a5730499de1818977c6c1ca557d6640 /usr/src | |
| parent | 452fab4bfe0f4a0322a258885624366426683ae8 (diff) | |
| download | illumos-joyent-b7c47e8c412d4654019e45625cf2be8f7fd6ee66.tar.gz | |
3492 some e1000g devices don't support 15 unicast addresses
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Marcel Telka <marcel.telka@nexenta.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
Reviewed by: Sašo Kiselkov <skiselkov.ml@gmail.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Eric Schrock <eric.schrock@delphix.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/io/e1000g/e1000g_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/uts/common/io/e1000g/e1000g_main.c b/usr/src/uts/common/io/e1000g/e1000g_main.c index e4c0a817b5..dcc7d87190 100644 --- a/usr/src/uts/common/io/e1000g/e1000g_main.c +++ b/usr/src/uts/common/io/e1000g/e1000g_main.c @@ -23,8 +23,8 @@ */ /* - * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright 2012 DEY Storage Systems, Inc. All rights reserved. + * Copyright 2013 Nexenta Systems, Inc. All rights reserved. */ /* @@ -2438,7 +2438,8 @@ e1000g_init_unicst(struct e1000g *Adapter) if (Adapter->init_count == 0) { /* Initialize the multiple unicast addresses */ - Adapter->unicst_total = MAX_NUM_UNICAST_ADDRESSES; + Adapter->unicst_total = min(hw->mac.rar_entry_count, + MAX_NUM_UNICAST_ADDRESSES); /* Workaround for an erratum of 82571 chipst */ if ((hw->mac.type == e1000_82571) && |