40 lines
1.0 KiB
Diff
40 lines
1.0 KiB
Diff
Subject: [PATCH] fix libnl-3.4.0 musl compile problem
|
|
Avoid in6_addr redefinition
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
|
|
---
|
|
include/linux-private/linux/if_bridge.h | 1 -
|
|
include/linux-private/linux/ipv6.h | 1 -
|
|
2 files changed, 2 deletions(-)
|
|
|
|
diff --git a/include/linux-private/linux/if_bridge.h b/include/linux-private/linux/if_bridge.h
|
|
index f24050b..8f7490c 100644
|
|
--- a/include/linux-private/linux/if_bridge.h
|
|
+++ b/include/linux-private/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"
|
|
diff --git a/include/linux-private/linux/ipv6.h b/include/linux-private/linux/ipv6.h
|
|
index e05e684..f16349d 100644
|
|
--- a/include/linux-private/linux/ipv6.h
|
|
+++ b/include/linux-private/linux/ipv6.h
|
|
@@ -2,7 +2,6 @@
|
|
#define _IPV6_H
|
|
|
|
#include <asm/byteorder.h>
|
|
-#include <linux/in6.h>
|
|
|
|
/* The latest drafts declared increase in minimal mtu up to 1280. */
|
|
|
|
--
|
|
2.7.4
|
|
|
|
|