]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Ensure GET_VLAN_VID_CMD is always defined
authorDaniel P. Berrange <berrange@redhat.com>
Thu, 7 Mar 2013 16:35:59 +0000 (16:35 +0000)
committerDaniel P. Berrange <berrange@redhat.com>
Thu, 7 Mar 2013 18:08:31 +0000 (18:08 +0000)
The RHEL4 vintage header files do not define GET_VLAN_VID_CMD.
Conditionally define it in our source, since the kernel can
raise a runtime error if it isn't supported

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
src/util/virnetdev.c

index 296871c6a7c0d66959e6ffbf93ce57502cafafb9..00e0f94f1562a9a88baa228079402086699a231f 100644 (file)
@@ -672,7 +672,7 @@ int virNetDevGetIndex(const char *ifname ATTRIBUTE_UNUSED,
 #endif /* ! SIOCGIFINDEX */
 
 
-#if defined(SIOCGIFVLAN) && defined(HAVE_STRUCT_IFREQ)
+#if defined(SIOCGIFVLAN) && defined(HAVE_STRUCT_IFREQ) && defined(GET_VLAN_VID_CMD)
 int virNetDevGetVLanID(const char *ifname, int *vlanid)
 {
     struct vlan_ioctl_args vlanargs = {