Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 / . / meta-openembedded / meta-networking / recipes-filter / ebtables / ebtables-2.0.10-4 / 0010-Adjust-header-include-sequence.patch
blob: a6ef9cd0990ef7f77b300a745c182fabdf5f28df [file] [log] [blame]
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]1From b7cee37734007fced7a4d5ed586c3a9e5ad92878 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 26 Mar 2017 13:12:21 -0700
4Subject: [PATCH 10/10] Adjust header include sequence
5
6This fixes the build with musl
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 extensions/ebt_among.c | 2 +-
11 extensions/ebt_arpreply.c | 2 +-
12 extensions/ebt_nat.c | 2 +-
13 include/linux/if_ether.h | 126 ----------------------------------------------
14 useful_functions.c | 4 +-
15 5 files changed, 5 insertions(+), 131 deletions(-)
16 delete mode 100644 include/linux/if_ether.h
17
18diff --git a/extensions/ebt_among.c b/extensions/ebt_among.c
19index f97d07e..b096847 100644
20--- a/extensions/ebt_among.c
21+++ b/extensions/ebt_among.c
22@@ -12,8 +12,8 @@
23 #include <getopt.h>
24 #include <ctype.h>
25 #include <unistd.h>
26-#include "../include/ebtables_u.h"
27 #include <netinet/ether.h>
28+#include "../include/ebtables_u.h"
29 #include "../include/ethernetdb.h"
30 #include <linux/if_ether.h>
31 #include <linux/netfilter_bridge/ebt_among.h>
32diff --git a/extensions/ebt_arpreply.c b/extensions/ebt_arpreply.c
33index c3757f3..c5102a4 100644
34--- a/extensions/ebt_arpreply.c
35+++ b/extensions/ebt_arpreply.c
36@@ -11,8 +11,8 @@
37 #include <stdlib.h>
38 #include <string.h>
39 #include <getopt.h>
40-#include "../include/ebtables_u.h"
41 #include <netinet/ether.h>
42+#include "../include/ebtables_u.h"
43 #include <linux/netfilter_bridge/ebt_arpreply.h>
44
45 static int mac_supplied;
46diff --git a/extensions/ebt_nat.c b/extensions/ebt_nat.c
47index e6afbf8..8d318d1 100644
48--- a/extensions/ebt_nat.c
49+++ b/extensions/ebt_nat.c
50@@ -10,8 +10,8 @@
51 #include <stdlib.h>
52 #include <string.h>
53 #include <getopt.h>
54-#include "../include/ebtables_u.h"
55 #include <netinet/ether.h>
56+#include "../include/ebtables_u.h"
57 #include <linux/netfilter_bridge/ebt_nat.h>
58
59 static int to_source_supplied, to_dest_supplied;
60diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
61deleted file mode 100644
62index 28a15ff..0000000
63--- a/include/linux/if_ether.h
64+++ /dev/null
65@@ -1,126 +0,0 @@
66-/*
67- * INET An implementation of the TCP/IP protocol suite for the LINUX
68- * operating system. INET is implemented using the BSD Socket
69- * interface as the means of communication with the user level.
70- *
71- * Global definitions for the Ethernet IEEE 802.3 interface.
72- *
73- * Version: @(#)if_ether.h 1.0.1a 02/08/94
74- *
75- * Author: Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
76- * Donald Becker, <becker@super.org>
77- * Alan Cox, <alan@lxorguk.ukuu.org.uk>
78- * Steve Whitehouse, <gw7rrm@eeshack3.swan.ac.uk>
79- *
80- * This program is free software; you can redistribute it and/or
81- * modify it under the terms of the GNU General Public License
82- * as published by the Free Software Foundation; either version
83- * 2 of the License, or (at your option) any later version.
84- */
85-
86-#ifndef _LINUX_IF_ETHER_H
87-#define _LINUX_IF_ETHER_H
88-
89-#include <linux/types.h>
90-
91-/*
92- * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
93- * and FCS/CRC (frame check sequence).
94- */
95-
96-#define ETH_ALEN 6 /* Octets in one ethernet addr */
97-#define ETH_HLEN 14 /* Total octets in header. */
98-#define ETH_ZLEN 60 /* Min. octets in frame sans FCS */
99-#define ETH_DATA_LEN 1500 /* Max. octets in payload */
100-#define ETH_FRAME_LEN 1514 /* Max. octets in frame sans FCS */
101-#define ETH_FCS_LEN 4 /* Octets in the FCS */
102-
103-/*
104- * These are the defined Ethernet Protocol ID's.
105- */
106-
107-#define ETH_P_LOOP 0x0060 /* Ethernet Loopback packet */
108-#define ETH_P_PUP 0x0200 /* Xerox PUP packet */
109-#define ETH_P_PUPAT 0x0201 /* Xerox PUP Addr Trans packet */
110-#define ETH_P_IP 0x0800 /* Internet Protocol packet */
111-#define ETH_P_X25 0x0805 /* CCITT X.25 */
112-#define ETH_P_ARP 0x0806 /* Address Resolution packet */
113-#define ETH_P_BPQ 0x08FF /* G8BPQ AX.25 Ethernet Packet [ NOT AN OFFICIALLY REGISTERED ID ] */
114-#define ETH_P_IEEEPUP 0x0a00 /* Xerox IEEE802.3 PUP packet */
115-#define ETH_P_IEEEPUPAT 0x0a01 /* Xerox IEEE802.3 PUP Addr Trans packet */
116-#define ETH_P_DEC 0x6000 /* DEC Assigned proto */
117-#define ETH_P_DNA_DL 0x6001 /* DEC DNA Dump/Load */
118-#define ETH_P_DNA_RC 0x6002 /* DEC DNA Remote Console */
119-#define ETH_P_DNA_RT 0x6003 /* DEC DNA Routing */
120-#define ETH_P_LAT 0x6004 /* DEC LAT */
121-#define ETH_P_DIAG 0x6005 /* DEC Diagnostics */
122-#define ETH_P_CUST 0x6006 /* DEC Customer use */
123-#define ETH_P_SCA 0x6007 /* DEC Systems Comms Arch */
124-#define ETH_P_TEB 0x6558 /* Trans Ether Bridging */
125-#define ETH_P_RARP 0x8035 /* Reverse Addr Res packet */
126-#define ETH_P_ATALK 0x809B /* Appletalk DDP */
127-#define ETH_P_AARP 0x80F3 /* Appletalk AARP */
128-#define ETH_P_8021Q 0x8100 /* 802.1Q VLAN Extended Header */
129-#define ETH_P_IPX 0x8137 /* IPX over DIX */
130-#define ETH_P_IPV6 0x86DD /* IPv6 over bluebook */
131-#define ETH_P_PAUSE 0x8808 /* IEEE Pause frames. See 802.3 31B */
132-#define ETH_P_SLOW 0x8809 /* Slow Protocol. See 802.3ad 43B */
133-#define ETH_P_WCCP 0x883E /* Web-cache coordination protocol
134- * defined in draft-wilson-wrec-wccp-v2-00.txt */
135-#define ETH_P_PPP_DISC 0x8863 /* PPPoE discovery messages */
136-#define ETH_P_PPP_SES 0x8864 /* PPPoE session messages */
137-#define ETH_P_MPLS_UC 0x8847 /* MPLS Unicast traffic */
138-#define ETH_P_MPLS_MC 0x8848 /* MPLS Multicast traffic */
139-#define ETH_P_ATMMPOA 0x884c /* MultiProtocol Over ATM */
140-#define ETH_P_LINK_CTL 0x886c /* HPNA, wlan link local tunnel */
141-#define ETH_P_ATMFATE 0x8884 /* Frame-based ATM Transport
142- * over Ethernet
143- */
144-#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */
145-#define ETH_P_AOE 0x88A2 /* ATA over Ethernet */
146-#define ETH_P_TIPC 0x88CA /* TIPC */
147-#define ETH_P_1588 0x88F7 /* IEEE 1588 Timesync */
148-#define ETH_P_FCOE 0x8906 /* Fibre Channel over Ethernet */
149-#define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */
150-#define ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
151-
152-/*
153- * Non DIX types. Won't clash for 1500 types.
154- */
155-
156-#define ETH_P_802_3 0x0001 /* Dummy type for 802.3 frames */
157-#define ETH_P_AX25 0x0002 /* Dummy protocol id for AX.25 */
158-#define ETH_P_ALL 0x0003 /* Every packet (be careful!!!) */
159-#define ETH_P_802_2 0x0004 /* 802.2 frames */
160-#define ETH_P_SNAP 0x0005 /* Internal only */
161-#define ETH_P_DDCMP 0x0006 /* DEC DDCMP: Internal only */
162-#define ETH_P_WAN_PPP 0x0007 /* Dummy type for WAN PPP frames*/
163-#define ETH_P_PPP_MP 0x0008 /* Dummy type for PPP MP frames */
164-#define ETH_P_LOCALTALK 0x0009 /* Localtalk pseudo type */
165-#define ETH_P_CAN 0x000C /* Controller Area Network */
166-#define ETH_P_PPPTALK 0x0010 /* Dummy type for Atalk over PPP*/
167-#define ETH_P_TR_802_2 0x0011 /* 802.2 frames */
168-#define ETH_P_MOBITEX 0x0015 /* Mobitex (kaz@cafe.net) */
169-#define ETH_P_CONTROL 0x0016 /* Card specific control frames */
170-#define ETH_P_IRDA 0x0017 /* Linux-IrDA */
171-#define ETH_P_ECONET 0x0018 /* Acorn Econet */
172-#define ETH_P_HDLC 0x0019 /* HDLC frames */
173-#define ETH_P_ARCNET 0x001A /* 1A for ArcNet :-) */
174-#define ETH_P_DSA 0x001B /* Distributed Switch Arch. */
175-#define ETH_P_TRAILER 0x001C /* Trailer switch tagging */
176-#define ETH_P_PHONET 0x00F5 /* Nokia Phonet frames */
177-#define ETH_P_IEEE802154 0x00F6 /* IEEE802.15.4 frame */
178-#define ETH_P_CAIF 0x00F7 /* ST-Ericsson CAIF protocol */
179-
180-/*
181- * This is an Ethernet frame header.
182- */
183-
184-struct ethhdr {
185- unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
186- unsigned char h_source[ETH_ALEN]; /* source ether addr */
187- __be16 h_proto; /* packet type ID field */
188-} __attribute__((packed));
189-
190-
191-#endif /* _LINUX_IF_ETHER_H */
192diff --git a/useful_functions.c b/useful_functions.c
193index d14cbe9..c304f4d 100644
194--- a/useful_functions.c
195+++ b/useful_functions.c
196@@ -22,8 +22,6 @@
197 * along with this program; if not, write to the Free Software
198 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
199 */
200-#include "include/ebtables_u.h"
201-#include "include/ethernetdb.h"
202 #include <stdio.h>
203 #include <netinet/ether.h>
204 #include <string.h>
205@@ -33,6 +31,8 @@
206 #include <sys/types.h>
207 #include <sys/socket.h>
208 #include <arpa/inet.h>
209+#include "include/ebtables_u.h"
210+#include "include/ethernetdb.h"
211
212 const unsigned char mac_type_unicast[ETH_ALEN] = {0,0,0,0,0,0};
213 const unsigned char msk_type_unicast[ETH_ALEN] = {1,0,0,0,0,0};
214--
2152.12.1
216