You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
42 lines
1.3 KiB
42 lines
1.3 KiB
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
# |
|
# Filename: package/.../musl/pkg/linux-header/libc-compat-if_ether.patch |
|
# Copyright (C) 2014 The OpenSDE Project |
|
# |
|
# More information can be found in the files COPYING and README. |
|
# |
|
# This patch file is dual-licensed. It is available under the license the |
|
# patched project is licensed under, as long as it is an OpenSource license |
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|
# of the GNU General Public License as published by the Free Software |
|
# Foundation; either version 2 of the License, or (at your option) any later |
|
# version. |
|
# --- SDE-COPYRIGHT-NOTE-END --- |
|
|
|
Avoid redefinition errors for 'struct ethhdr' |
|
|
|
--- a/include/uapi/linux/if_ether.h |
|
+++ b/include/uapi/linux/if_ether.h |
|
@@ -22,6 +22,7 @@ |
|
#define _UAPI_LINUX_IF_ETHER_H |
|
|
|
#include <linux/types.h> |
|
+#include <linux/libc-compat.h> |
|
|
|
/* |
|
* IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble |
|
@@ -130,11 +131,13 @@ |
|
* This is an Ethernet frame header. |
|
*/ |
|
|
|
+#if __UAPI_DEF_ETHHDR |
|
struct ethhdr { |
|
unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ |
|
unsigned char h_source[ETH_ALEN]; /* source ether addr */ |
|
__be16 h_proto; /* packet type ID field */ |
|
} __attribute__((packed)); |
|
+#endif |
|
|
|
|
|
#endif /* _UAPI_LINUX_IF_ETHER_H */
|
|
|