if_name collides w/ ietf-interfaces.yang member name, causing a build-break
in an existing yang-model-based app. Rename to "netmap_if_name".
Change-Id: Id386eacd77343dd15a868c28dacd2b0e4523bc9b
Signed-off-by: Dave Barach <dave@barachs.net>
M(NETMAP_CREATE, netmap_create);
M(NETMAP_CREATE, netmap_create);
- clib_memcpy (mp->if_name, if_name, vec_len (if_name));
+ clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name));
clib_memcpy (mp->hw_addr, hw_addr, 6);
mp->use_random_hw_addr = random_hw_addr;
mp->is_pipe = is_pipe;
clib_memcpy (mp->hw_addr, hw_addr, 6);
mp->use_random_hw_addr = random_hw_addr;
mp->is_pipe = is_pipe;
M(NETMAP_DELETE, netmap_delete);
M(NETMAP_DELETE, netmap_delete);
- clib_memcpy (mp->if_name, if_name, vec_len (if_name));
+ clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name));
vec_free (if_name);
S; W;
vec_free (if_name);
S; W;
int rv = 0;
u8 *if_name = NULL;
int rv = 0;
u8 *if_name = NULL;
- if_name = format(0, "%s", mp->if_name);
+ if_name = format(0, "%s", mp->netmap_if_name);
vec_add1 (if_name, 0);
rv = netmap_create_if(vm, if_name, mp->use_random_hw_addr ? 0 : mp->hw_addr,
vec_add1 (if_name, 0);
rv = netmap_create_if(vm, if_name, mp->use_random_hw_addr ? 0 : mp->hw_addr,
int rv = 0;
u8 *if_name = NULL;
int rv = 0;
u8 *if_name = NULL;
- if_name = format(0, "%s", mp->if_name);
+ if_name = format(0, "%s", mp->netmap_if_name);
vec_add1 (if_name, 0);
rv = netmap_delete_if(vm, if_name);
vec_add1 (if_name, 0);
rv = netmap_delete_if(vm, if_name);
/** \brief Create netmap
@param client_index - opaque cookie to identify the sender
@param context - sender context, to match reply w/ request
/** \brief Create netmap
@param client_index - opaque cookie to identify the sender
@param context - sender context, to match reply w/ request
- @param if_name - interface name
+ @param netmap_if_name - interface name
@param hw_addr - interface MAC
@param use_random_hw_addr - use random generated MAC
@param is_pipe - is pipe
@param hw_addr - interface MAC
@param use_random_hw_addr - use random generated MAC
@param is_pipe - is pipe
u32 client_index;
u32 context;
u32 client_index;
u32 context;
u8 hw_addr[6];
u8 use_random_hw_addr;
u8 is_pipe;
u8 hw_addr[6];
u8 use_random_hw_addr;
u8 is_pipe;
/** \brief Delete netmap
@param client_index - opaque cookie to identify the sender
@param context - sender context, to match reply w/ request
/** \brief Delete netmap
@param client_index - opaque cookie to identify the sender
@param context - sender context, to match reply w/ request
- @param if_name - interface name
+ @param netmap_if_name - interface name
*/
define netmap_delete {
u32 client_index;
u32 context;
*/
define netmap_delete {
u32 client_index;
u32 context;
};
/** \brief Delete netmap response
};
/** \brief Delete netmap response