proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-30 05:06:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

network: simplify instantiate_macvlan()

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2019-07-03 21:39:24 +02:00
parent 3ebffb9896
commit 8021de2564
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lxc/network.c
View File

@ -332,7 +332,7 @@ out_delete:
static int instantiate_macvlan(struct lxc_handler *handler, struct lxc_netdev *netdev) static int instantiate_macvlan(struct lxc_handler *handler, struct lxc_netdev *netdev)
{ {
char peerbuf[IFNAMSIZ], *peer; char peer[IFNAMSIZ];
int err; int err;
unsigned int mtu = 0; unsigned int mtu = 0;
@ -341,12 +341,11 @@ static int instantiate_macvlan(struct lxc_handler *handler, struct lxc_netdev *n
return -1; return -1;
} }
err = snprintf(peerbuf, sizeof(peerbuf), "mcXXXXXX"); err = snprintf(peer, sizeof(peer), "mcXXXXXX");
if (err < 0 || (size_t)err >= sizeof(peerbuf)) if (err < 0 || (size_t)err >= sizeof(peer))
return -1; return -1;
peer = lxc_mkifname(peerbuf); if (!lxc_mkifname(peer))
if (!peer)
return -1; return -1;
err = lxc_macvlan_create(netdev->link, peer, err = lxc_macvlan_create(netdev->link, peer,