External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: remove obsolete check for GET_VLAN_VID_CMD

Browse Source 
The GET_VLAN_VID_CMD constant has existed since before Linux moved
to git.

This is old enough that all our supported platforms can be assumed
to have this feature.

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2022-12-08 09:45:20 +00:00
parent efb8acb7f7
commit d1c517d965
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meson.build
View File

@ -650,9 +650,6 @@ symbols = [
# Check whether endian provides handy macros. # Check whether endian provides handy macros.
[ 'endian.h', 'htole64' ], [ 'endian.h', 'htole64' ],
# GET_VLAN_VID_CMD is required for virNetDevGetVLanID
[ 'linux/if_vlan.h', 'GET_VLAN_VID_CMD' ],
[ 'unistd.h', 'SEEK_HOLE' ], [ 'unistd.h', 'SEEK_HOLE' ],
# Check for BSD approach for setting MAC addr # Check for BSD approach for setting MAC addr

6
src/util/virnetdev.c
View File

@ -959,7 +959,7 @@ virNetDevGetMaster(const char *ifname G_GNUC_UNUSED,
#endif /* defined(WITH_LIBNL) */ #endif /* defined(WITH_LIBNL) */
#if defined(SIOCGIFVLAN) && defined(WITH_STRUCT_IFREQ) && WITH_DECL_GET_VLAN_VID_CMD #if __linux__
int virNetDevGetVLanID(const char *ifname, int *vlanid) int virNetDevGetVLanID(const char *ifname, int *vlanid)
{ {
struct vlan_ioctl_args vlanargs = { struct vlan_ioctl_args vlanargs = {
@ -989,7 +989,7 @@ int virNetDevGetVLanID(const char *ifname, int *vlanid)
*vlanid = vlanargs.u.VID; *vlanid = vlanargs.u.VID;
return 0; return 0;
} }
#else /* ! SIOCGIFVLAN */ #else /* ! __linux__ */
int virNetDevGetVLanID(const char *ifname G_GNUC_UNUSED, int virNetDevGetVLanID(const char *ifname G_GNUC_UNUSED,
int *vlanid G_GNUC_UNUSED) int *vlanid G_GNUC_UNUSED)
{ {
@ -997,7 +997,7 @@ int virNetDevGetVLanID(const char *ifname G_GNUC_UNUSED,
_("Unable to get VLAN on this platform")); _("Unable to get VLAN on this platform"));
return -1; return -1;
} }
#endif /* ! SIOCGIFVLAN */ #endif /* ! __linux__ */
/** /**