diff options
| author | Darren Reed <Darren.Reed@Sun.COM> | 2010-02-16 18:16:03 -0800 |
|---|---|---|
| committer | Darren Reed <Darren.Reed@Sun.COM> | 2010-02-16 18:16:03 -0800 |
| commit | f195a053296452c436ff92823061ac0d2492678c (patch) | |
| tree | 172ecb94a8231568ec453600de3a96adee819904 | |
| parent | 1f0f5e3e328e41529296f756090856aa7f239b1c (diff) | |
| download | illumos-gate-f195a053296452c436ff92823061ac0d2492678c.tar.gz | |
6922926 bpf needs to use the native mac type
| -rw-r--r-- | usr/src/uts/common/io/bpf/bpf_mac.c | 6 | ||||
| -rw-r--r-- | usr/src/uts/common/io/mac/mac_client.c | 8 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/mac.h | 3 |
3 files changed, 12 insertions, 5 deletions
diff --git a/usr/src/uts/common/io/bpf/bpf_mac.c b/usr/src/uts/common/io/bpf/bpf_mac.c index 96c948f0e7..8ce41c0d34 100644 --- a/usr/src/uts/common/io/bpf/bpf_mac.c +++ b/usr/src/uts/common/io/bpf/bpf_mac.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -94,7 +94,7 @@ mac_bpf_name(uintptr_t mhandle) static int mac_bpf_type(uintptr_t mhandle) { - return (mac_type((mac_handle_t)mhandle)); + return (mac_nativetype((mac_handle_t)mhandle)); } static void @@ -183,7 +183,7 @@ mac_bpf_getzone(uintptr_t handle, zoneid_t *zip) static int mac_bpf_getdlt(uintptr_t handle, uint_t *dltp) { - *dltp = mac_type((mac_handle_t)handle); + *dltp = mac_nativetype((mac_handle_t)handle); return (0); } diff --git a/usr/src/uts/common/io/mac/mac_client.c b/usr/src/uts/common/io/mac/mac_client.c index 421c3e9bbd..78c7eae9f2 100644 --- a/usr/src/uts/common/io/mac/mac_client.c +++ b/usr/src/uts/common/io/mac/mac_client.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -428,6 +428,12 @@ mac_type(mac_handle_t mh) return (((mac_impl_t *)mh)->mi_type->mt_type); } +int +mac_nativetype(mac_handle_t mh) +{ + return (((mac_impl_t *)mh)->mi_type->mt_nativetype); +} + char * mac_client_name(mac_client_handle_t mch) { diff --git a/usr/src/uts/common/sys/mac.h b/usr/src/uts/common/sys/mac.h index fc0ea57e8c..7a8fc3293d 100644 --- a/usr/src/uts/common/sys/mac.h +++ b/usr/src/uts/common/sys/mac.h @@ -20,7 +20,7 @@ */ /* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -592,6 +592,7 @@ extern void mac_sdu_get(mac_handle_t, uint_t *, uint_t *); extern int mac_maxsdu_update(mac_handle_t, uint_t); extern uint_t mac_addr_len(mac_handle_t); extern int mac_type(mac_handle_t); +extern int mac_nativetype(mac_handle_t); extern void mac_unicst_update(mac_handle_t, const uint8_t *); |