From fcbb6fed85ea9ff4feb4f1ebd4f0f235fdaf06b6 Mon Sep 17 00:00:00 2001 From: David Heidelberger <david.heidelberger@ixit.cz> Date: Mon, 29 Jun 2015 16:53:03 +0200 Subject: [PATCH 3/3] uapi/if_ether.h: prevent redefinition of struct ethhdr Musl provides its own ethhdr struct definition. Add a guard to prevent its definition of the appropriate musl header has already been included. Signed-off-by: John Spencer <maillist-linux@barfooze.de> Tested-by: David Heidelberger <david.heidelberger@ixit.cz> Signed-off-by: Jonas Gorski <jogo@openwrt.org> --- include/uapi/linux/if_ether.h | 3 +++ include/uapi/linux/libc-compat.h | 11 +++++++++++ 2 files changed, 14 insertions(+) --- 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 @@ -135,11 +136,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 */ --- a/include/uapi/linux/libc-compat.h +++ b/include/uapi/linux/libc-compat.h @@ -85,6 +85,14 @@ #endif /* _NET_IF_H */ +/* musl defines the ethhdr struct itself in its netinet/if_ether.h. + * Glibc just includes the kernel header and uses a different guard. */ +#if defined(_NETINET_IF_ETHER_H) +#define __UAPI_DEF_ETHHDR 0 +#else +#define __UAPI_DEF_ETHHDR 1 +#endif + /* Coordinate with libc netinet/in.h header. */ #if defined(_NETINET_IN_H) @@ -161,6 +169,9 @@ /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 +/* Definitions for if_ether.h */ +#define __UAPI_DEF_ETHHDR 1 + /* Definitions for in.h */ #define __UAPI_DEF_IN_ADDR 1 #define __UAPI_DEF_IN_IPPROTO 1 ef='/cgit.cgi/openwrt/em-br6478acv2/master-187ad058/commit/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom?id=fd18877418cf14f6bc2b413a238a3ca5f6d9ad94'>commit</a><a href='/cgit.cgi/openwrt/em-br6478acv2/master-187ad058/diff/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom?id=fd18877418cf14f6bc2b413a238a3ca5f6d9ad94'>diff</a><a href='/cgit.cgi/openwrt/em-br6478acv2/master-187ad058/stats/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/openwrt/em-br6478acv2/master-187ad058/log/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom'> <input type='hidden' name='id' value='fd18877418cf14f6bc2b413a238a3ca5f6d9ad94'/><select name='qt'> <option value='grep'>log msg</option> <option value='author'>author</option> <option value='committer'>committer</option> <option value='range'>range</option> </select> <input class='txt' type='search' size='10' name='q' value=''/> <input type='submit' value='search'/> </form> </td></tr></table> <div class='path'>path: <a href='/cgit.cgi/openwrt/em-br6478acv2/master-187ad058/tree/?id=fd18877418cf14f6bc2b413a238a3ca5f6d9ad94'>root</a>/<a href='/cgit.cgi/openwrt/em-br6478acv2/master-187ad058/tree/target?id=fd18877418cf14f6bc2b413a238a3ca5f6d9ad94'>target</a>/<a href='/cgit.cgi/openwrt/em-br6478acv2/master-187ad058/tree/target/linux?id=fd18877418cf14f6bc2b413a238a3ca5f6d9ad94'>linux</a>/<a href='/cgit.cgi/openwrt/em-br6478acv2/master-187ad058/tree/target/linux/ramips?id=fd18877418cf14f6bc2b413a238a3ca5f6d9ad94'>ramips</a>/<a href='/cgit.cgi/openwrt/em-br6478acv2/master-187ad058/tree/target/linux/ramips/base-files?id=fd18877418cf14f6bc2b413a238a3ca5f6d9ad94'>base-files</a>/<a href='/cgit.cgi/openwrt/em-br6478acv2/master-187ad058/tree/target/linux/ramips/base-files/etc?id=fd18877418cf14f6bc2b413a238a3ca5f6d9ad94'>etc</a>/<a href='/cgit.cgi/openwrt/em-br6478acv2/master-187ad058/tree/target/linux/ramips/base-files/etc/hotplug.d?id=fd18877418cf14f6bc2b413a238a3ca5f6d9ad94'>hotplug.d</a>/<a href='/cgit.cgi/openwrt/em-br6478acv2/master-187ad058/tree/target/linux/ramips/base-files/etc/hotplug.d/firmware?id=fd18877418cf14f6bc2b413a238a3ca5f6d9ad94'>firmware</a>/<a href='/cgit.cgi/openwrt/em-br6478acv2/master-187ad058/tree/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom?id=fd18877418cf14f6bc2b413a238a3ca5f6d9ad94'>10-rt2x00-eeprom</a></div><div class='content'>blob: 32c97fce41421df9ab9a515d1ce4d7f0f32e2f53 (<a href='/cgit.cgi/openwrt/em-br6478acv2/master-187ad058/plain/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom?id=fd18877418cf14f6bc2b413a238a3ca5f6d9ad94'>plain</a>) <table summary='blob content' class='blob'> <tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a> <a id='n2' href='#n2'>2</a> <a id='n3' href='#n3'>3</a> <a id='n4' href='#n4'>4</a> <a id='n5' href='#n5'>5</a> <a id='n6' href='#n6'>6</a> <a id='n7' href='#n7'>7</a> <a id='n8' href='#n8'>8</a> <a id='n9' href='#n9'>9</a> <a id='n10' href='#n10'>10</a> <a id='n11' href='#n11'>11</a> <a id='n12' href='#n12'>12</a> <a id='n13' href='#n13'>13</a> <a id='n14' href='#n14'>14</a> <a id='n15' href='#n15'>15</a> <a id='n16' href='#n16'>16</a> <a id='n17' href='#n17'>17</a> <a id='n18' href='#n18'>18</a> <a id='n19' href='#n19'>19</a> <a id='n20' href='#n20'>20</a> <a id='n21' href='#n21'>21</a> <a id='n22' href='#n22'>22</a> <a id='n23' href='#n23'>23</a> <a id='n24' href='#n24'>24</a> <a id='n25' href='#n25'>25</a> <a id='n26' href='#n26'>26</a> <a id='n27' href='#n27'>27</a> <a id='n28' href='#n28'>28</a> <a id='n29' href='#n29'>29</a> <a id='n30' href='#n30'>30</a> <a id='n31' href='#n31'>31</a> <a id='n32' href='#n32'>32</a> <a id='n33' href='#n33'>33</a> <a id='n34' href='#n34'>34</a> <a id='n35' href='#n35'>35</a> <a id='n36' href='#n36'>36</a> <a id='n37' href='#n37'>37</a> <a id='n38' href='#n38'>38</a> <a id='n39' href='#n39'>39</a> <a id='n40' href='#n40'>40</a> <a id='n41' href='#n41'>41</a> <a id='n42' href='#n42'>42</a> <a id='n43' href='#n43'>43</a> <a id='n44' href='#n44'>44</a> <a id='n45' href='#n45'>45</a> <a id='n46' href='#n46'>46</a> <a id='n47' href='#n47'>47</a> <a id='n48' href='#n48'>48</a> <a id='n49' href='#n49'>49</a> <a id='n50' href='#n50'>50</a> <a id='n51' href='#n51'>51</a> <a id='n52' href='#n52'>52</a> <a id='n53' href='#n53'>53</a> <a id='n54' href='#n54'>54</a> <a id='n55' href='#n55'>55</a> <a id='n56' href='#n56'>56</a> <a id='n57' href='#n57'>57</a> <a id='n58' href='#n58'>58</a> <a id='n59' href='#n59'>59</a> <a id='n60' href='#n60'>60</a> <a id='n61' href='#n61'>61</a> <a id='n62' href='#n62'>62</a> <a id='n63' href='#n63'>63</a> <a id='n64' href='#n64'>64</a> <a id='n65' href='#n65'>65</a> <a id='n66' href='#n66'>66</a> <a id='n67' href='#n67'>67</a> <a id='n68' href='#n68'>68</a> <a id='n69' href='#n69'>69</a> <a id='n70' href='#n70'>70</a> <a id='n71' href='#n71'>71</a> <a id='n72' href='#n72'>72</a> <a id='n73' href='#n73'>73</a> <a id='n74' href='#n74'>74</a> <a id='n75' href='#n75'>75</a> <a id='n76' href='#n76'>76</a> <a id='n77' href='#n77'>77</a> <a id='n78' href='#n78'>78</a> <a id='n79' href='#n79'>79</a> <a id='n80' href='#n80'>80</a> <a id='n81' href='#n81'>81</a> <a id='n82' href='#n82'>82</a> <a id='n83' href='#n83'>83</a> <a id='n84' href='#n84'>84</a> <a id='n85' href='#n85'>85</a> <a id='n86' href='#n86'>86</a> <a id='n87' href='#n87'>87</a> <a id='n88' href='#n88'>88</a> <a id='n89' href='#n89'>89</a> <a id='n90' href='#n90'>90</a> <a id='n91' href='#n91'>91</a> <a id='n92' href='#n92'>92</a> <a id='n93' href='#n93'>93</a> <a id='n94' href='#n94'>94</a> <a id='n95' href='#n95'>95</a> <a id='n96' href='#n96'>96</a> <a id='n97' href='#n97'>97</a> <a id='n98' href='#n98'>98</a> <a id='n99' href='#n99'>99</a> <a id='n100' href='#n100'>100</a> <a id='n101' href='#n101'>101</a> <a id='n102' href='#n102'>102</a> <a id='n103' href='#n103'>103</a> <a id='n104' href='#n104'>104</a> <a id='n105' href='#n105'>105</a> <a id='n106' href='#n106'>106</a> <a id='n107' href='#n107'>107</a> <a id='n108' href='#n108'>108</a> <a id='n109' href='#n109'>109</a> <a id='n110' href='#n110'>110</a> <a id='n111' href='#n111'>111</a> <a id='n112' href='#n112'>112</a> <a id='n113' href='#n113'>113</a> <a id='n114' href='#n114'>114</a> </pre></td> <td class='lines'><pre><code>