Re: [libvirt] the patch "bridge: export multicast database via netlink" broke kernel 3.8 uapi
Cong Wang skrev 15.1.2013 12:11:
On Tue, 2013-01-15 at 12:03 +0200, Thomas Backlund wrote:
> Eric Blake skrev 15.1.2013 01:57:
>> On 01/13/2013 01:05 PM, Thomas Backlund wrote:
>>> Thomas Backlund skrev 13.1.2013 20:38:
>>>> patch both inline and attached as thunderbird tends to mess up ...
>>>
>>>> -----
>>>>
>>>> if_bridge.h uses struct in6_addr ip6; but does not include the in6.h
>>>> header.
>>>>
>>>> Found by trying to build libvirt and connman against 3.8-rc3 headers.
>>>>
>>>
>>> Ok,
>>> ignore this patch, it's not the correct fix as it introduces
>>> redefinitions...
>>>
>>> Btw, the error that I hit that made me suggest this fix was libvirt
>>> config check bailing out:
>>>
>>> config.log:/usr/include/linux/if_bridge.h:173:20: error: field 'ip6'
has
>>> incomplete type
>>
>> Hmm, just now noticing this thread, after independently hitting and and
>> having to work around the same problem in libvirt:
>> https://www.redhat.com/archives/libvir-list/2013-January/msg00930.html
>> https://bugzilla.redhat.com/show_bug.cgi?id=895141
>
>
> Yep,
>
> and the commit breaking uapi headers is by using "struct in6_addr ip6" is:
>
>
> From ee07c6e7a6f8a25c18f0a6b18152fbd7499245f6 Mon Sep 17 00:00:00 2001
> From: Cong Wang <amwang(a)redhat.com>
> Date: Fri, 7 Dec 2012 00:04:48 +0000
> Subject: [PATCH] bridge: export multicast database via netlink
Does the following patch help?
$ git diff include/uapi/linux/if_bridge.h
diff --git a/include/uapi/linux/if_bridge.h
b/include/uapi/linux/if_bridge.h
index 5db2975..653db23 100644
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -14,6 +14,7 @@
#define _UAPI_LINUX_IF_BRIDGE_H
#include <linux/types.h>
+#include <linux/in6.h>
#define SYSFS_BRIDGE_ATTR "bridge"
#define SYSFS_BRIDGE_FDB "brforward"
Well, I suggested the same fix in the beginning of the thread
on netdev and lkml: "if_bridge.h: include in6.h for struct in6_addr use"
as it seemed to fix the libvirt case
but then asked it to be ignored after I tried to build connman,
and hit this conflict with glibc-2.17:
In file included from /usr/include/arpa/inet.h:22:0,
from ./include/connman/inet.h:25,
from src/connman.h:128,
from src/tethering.c:40:
/usr/include/netinet/in.h:35:5: error: expected identifier before
numeric constant
/usr/include/netinet/in.h:197:8: error: redefinition of 'struct in6_addr'
In file included from /usr/include/linux/if_bridge.h:17:0,
from src/tethering.c:38:
/usr/include/linux/in6.h:30:8: note: originally defined here
In file included from /usr/include/arpa/inet.h:22:0,
from ./include/connman/inet.h:25,
from src/connman.h:128,
from src/tethering.c:40:
/usr/include/netinet/in.h:238:8: error: redefinition of 'struct
sockaddr_in6'
In file included from /usr/include/linux/if_bridge.h:17:0,
from src/tethering.c:38:
/usr/include/linux/in6.h:46:8: note: originally defined here
In file included from /usr/include/arpa/inet.h:22:0,
from ./include/connman/inet.h:25,
from src/connman.h:128,
from src/tethering.c:40:
/usr/include/netinet/in.h:274:8: error: redefinition of 'struct ipv6_mreq'
In file included from /usr/include/linux/if_bridge.h:17:0,
from src/tethering.c:38:
/usr/include/linux/in6.h:54:8: note: originally defined here
make[1]: *** [src/src_connmand-tethering.o] Error 1
So I'm not sure it's the right one...
--
Thomas