| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 1 | From 02ed10fc5215c4a32e6740b0a0c2439659be6801 Mon Sep 17 00:00:00 2001 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 2 | From: Changhyeok Bae <changhyeok.bae@gmail.com> |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 3 | Date: Mon, 13 Nov 2017 15:59:35 +0000 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 4 | Subject: [PATCH] ip: Remove unneed header |
| 5 | |
| 6 | Fix redefinition of struct ethhdr with a suitably patched musl libc |
| 7 | that suppresses the kernel if_ether.h. |
| 8 | |
| 9 | Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com> |
| 10 | |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 11 | Upstream-Status: Pending [netdev@vger.kernel.org] |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 12 | --- |
| 13 | ip/iplink_bridge.c | 1 - |
| 14 | 1 file changed, 1 deletion(-) |
| 15 | |
| 16 | diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 17 | index cccdec1..f065b22 100644 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 18 | --- a/ip/iplink_bridge.c |
| 19 | +++ b/ip/iplink_bridge.c |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 20 | @@ -13,7 +13,6 @@ |
| 21 | #include <stdlib.h> |
| 22 | #include <string.h> |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 23 | #include <netinet/in.h> |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 24 | -#include <netinet/ether.h> |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 25 | #include <linux/if_link.h> |
| 26 | #include <linux/if_bridge.h> |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 27 | #include <net/if.h> |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 28 | -- |
| 29 | 2.7.4 |
| 30 | |