From patchwork Tue Jan 15 10:11:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amerigo Wang X-Patchwork-Id: 212065 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 83FDD2C00A6 for ; Tue, 15 Jan 2013 21:11:59 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756429Ab3AOKLn (ORCPT ); Tue, 15 Jan 2013 05:11:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47711 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753645Ab3AOKLm (ORCPT ); Tue, 15 Jan 2013 05:11:42 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r0FABZ3H024354 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 15 Jan 2013 05:11:35 -0500 Received: from [10.66.114.41] (vpn1-114-41.nay.redhat.com [10.66.114.41]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r0FABTgM019586 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Tue, 15 Jan 2013 05:11:32 -0500 Message-ID: <1358244688.4264.7.camel@cr0> Subject: Re: the patch "bridge: export multicast database via netlink" broke kernel 3.8 uapi (was: Re: [libvirt] if_bridge.h: include in6.h for struct in6_addr use) From: Cong Wang To: Thomas Backlund Cc: Eric Blake , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, libvirt-list@redhat.com, tgraf@suug.ch Date: Tue, 15 Jan 2013 18:11:28 +0800 In-Reply-To: <50F52956.50201@mageia.org> References: <50F2FF1B.3020708@mageia.org> <50F313A5.3020707@mageia.org> <50F49B7E.50906@redhat.com> <50F52956.50201@mageia.org> Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 > 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 --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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 +#include #define SYSFS_BRIDGE_ATTR "bridge" #define SYSFS_BRIDGE_FDB "brforward"