diff options
| author | Sowmini Varadhan <Sowmini.Varadhan@oracle.COM> | 2010-08-02 08:40:07 -0400 |
|---|---|---|
| committer | Sowmini Varadhan <Sowmini.Varadhan@oracle.COM> | 2010-08-02 08:40:07 -0400 |
| commit | fff7ec1d8ce71b3d8a998ac4391a99860ce07180 (patch) | |
| tree | f2067adfe98c4d0c52f4ad855549ff191695f196 /usr/src/uts/common/inet/ip/ip.c | |
| parent | 29c56acb8635e0b7173b9ec6046f477942e3ac95 (diff) | |
| download | illumos-joyent-fff7ec1d8ce71b3d8a998ac4391a99860ce07180.tar.gz | |
6966758 ire generation numbers changes on shared IP zone boot throws off uperf numbers
6972874 zone shutdown can fail when resetting link protection on datalinks created inside a NGZ
Diffstat (limited to 'usr/src/uts/common/inet/ip/ip.c')
| -rw-r--r-- | usr/src/uts/common/inet/ip/ip.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/uts/common/inet/ip/ip.c b/usr/src/uts/common/inet/ip/ip.c index 85876a4b74..3f18bf4d7e 100644 --- a/usr/src/uts/common/inet/ip/ip.c +++ b/usr/src/uts/common/inet/ip/ip.c @@ -9378,7 +9378,7 @@ ip_input_options(ipha_t *ipha, ipaddr_t dst, mblk_t *mp, */ if (optval == IPOPT_SSRR) { ire = ire_ftable_lookup_v4(dst, 0, 0, - IRE_IF_ALL, NULL, ALL_ZONES, + IRE_INTERFACE, NULL, ALL_ZONES, ira->ira_tsl, MATCH_IRE_TYPE | MATCH_IRE_SECATTR, 0, ipst, NULL); @@ -12915,7 +12915,8 @@ ip_output_options(mblk_t *mp, ipha_t *ipha, ip_xmit_attr_t *ixa, ill_t *ill) */ if (optval == IPOPT_SSRR) { ire = ire_ftable_lookup_v4(dst, 0, 0, - IRE_IF_ALL, NULL, ALL_ZONES, ixa->ixa_tsl, + IRE_INTERFACE, NULL, ALL_ZONES, + ixa->ixa_tsl, MATCH_IRE_TYPE | MATCH_IRE_SECATTR, 0, ipst, NULL); if (ire == NULL) { |