[libvirt] [PATCH] define NTF_{SELF,MASTER} if undefined

Jiri Denemark jdenemar at redhat.com
Tue Dec 9 09:31:48 UTC 2014


On Tue, Dec 09, 2014 at 10:17:20 +0100, Martin Kletzander wrote:
> On Tue, Dec 09, 2014 at 07:56:34AM +0100, Guido Günther wrote:
> >Older kernel headers lack this definition (e.g. Debian Wheezy's 3.2)
> >---
> > src/util/virnetdevbridge.c | 9 +++++++++
> > 1 file changed, 9 insertions(+)
> >
> >diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c
> >index 73ec40b..d92a9de 100644
> >--- a/src/util/virnetdevbridge.c
> >+++ b/src/util/virnetdevbridge.c
> >@@ -919,6 +919,15 @@ virNetDevBridgeSetVlanFiltering(const char *brname ATTRIBUTE_UNUSED,
> >
> >
> > #if defined(__linux__) && defined(HAVE_LIBNL)
> >+
> >+#ifndef NTF_SELF
> >+#define NTF_SELF 0x02
> >+#endif
> >+
> >+#ifndef NTF_MASTER
> >+#define NTF_MASTER 0x04
> >+#endif
> >+
> > /* virNetDevBridgeFDBAddDel:
> >  * @mac: the MAC address being added to the table
> >  * @ifname: name of the port (interface) of the bridge that wants this MAC
> >--
> >2.1.3
> >
> 
> ACK, safe for freeze.

However, cppi would complain about wrong indentation, it should be

# ifndef ...
#  define ...
# endif
...

Jirka




More information about the libvir-list mailing list