package/network/utils/ebtables/patches/100-musl_fix.patch

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