| Message ID | 20141209203007.188651df@urahara |
|---|---|
| State | Rejected, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Stephen Hemminger <stephen@networkplumber.org> Date: Tue, 9 Dec 2014 20:30:07 -0800 > This reverts commit 66f1c44887ba4f47d617f8ae21cf8e04e1892bd7. > > iproute2 uses sanitized kernel headers, and this change broke the build. > The problem is that the iproute2 ip/iplink_bridge_slave.c include if_bridge.h > but this causes a redefintion error when Glibc <netlink/in.h> is included. > > Since iproute2 is arguably the most important user of network headers, > the uapi header change should be reverted. > > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Stephen, please understand first the reason for this change. GLIBC and the kernel fight over various definitions of core networking types. The only way to resolve this in the long term is this change in question. If you can make iproute2 work with both the new and the old mechanims, please do so instead of reverting this important change. -- 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 b03ee8f..439fd0d 100644 --- a/include/uapi/linux/if_bridge.h +++ b/include/uapi/linux/if_bridge.h @@ -15,7 +15,6 @@ #include <linux/types.h> #include <linux/if_ether.h> -#include <linux/in6.h> #define SYSFS_BRIDGE_ATTR "bridge" #define SYSFS_BRIDGE_FDB "brforward"
This reverts commit 66f1c44887ba4f47d617f8ae21cf8e04e1892bd7. iproute2 uses sanitized kernel headers, and this change broke the build. The problem is that the iproute2 ip/iplink_bridge_slave.c include if_bridge.h but this causes a redefintion error when Glibc <netlink/in.h> is included. Since iproute2 is arguably the most important user of network headers, the uapi header change should be reverted. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- Please update stable as well. include/uapi/linux/if_bridge.h | 1 - 1 file changed, 1 deletion(-)