diff options
Diffstat (limited to 'src/plugins/lisp/lisp-cp/lisp_types.h')
| -rw-r--r-- | src/plugins/lisp/lisp-cp/lisp_types.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/lisp/lisp-cp/lisp_types.h b/src/plugins/lisp/lisp-cp/lisp_types.h index 3f7d0302640..e92f8f80c70 100644 --- a/src/plugins/lisp/lisp-cp/lisp_types.h +++ b/src/plugins/lisp/lisp-cp/lisp_types.h @@ -198,7 +198,8 @@ u8 gid_address_len (gid_address_t * a); void *gid_address_cast (gid_address_t * gid, gid_address_type_t type); void gid_address_copy (gid_address_t * dst, gid_address_t * src); u32 gid_address_parse (u8 * offset, gid_address_t * a); -void gid_address_ip_set (gid_address_t * dst, void *src, u8 version); +void gid_address_ip_set (gid_address_t *dst, void *src, + ip_address_family_t version); #define gid_address_type(_a) (_a)->type #define gid_address_ippref(_a) (_a)->ippref @@ -238,7 +239,6 @@ void gid_address_ip_set (gid_address_t * dst, void *src, u8 version); _(nsh) \ _(sd) -/* *INDENT-OFF* */ #define _(_n) \ u16 _n ## _size_to_write (void * pref); \ u16 _n ## _write (u8 * p, void * pref); \ @@ -248,12 +248,11 @@ void _n ## _copy (void * dst , void * src); foreach_gid_address_type_fcns #undef _ -/* *INDENT-ON* */ always_inline u64 mac_to_u64 (u8 * m) { - return (*((u64 *) m) & 0xffffffffffff); + return (*(u32 *) m) | ((u64) (*(u16 *) (m + 4)) << 32); } typedef struct |