From 6d3bc769657b0ee7c7506dad9911111c4226a7ea Mon Sep 17 00:00:00 2001
From: Imre Kaloz <kaloz@openwrt.org>
Date: Fri, 7 Jul 2017 17:21:05 +0200
Subject: mac80211: increase wireless mesh header size

lede-commit 3d4466cfd8f75f717efdb1f96fdde3c70d865fc1
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
---
 include/linux/netdevice.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -138,8 +138,8 @@ static inline bool dev_xmit_complete(int
 
 #if defined(CONFIG_HYPERV_NET)
 # define LL_MAX_HEADER 128
-#elif defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25)
-# if defined(CONFIG_MAC80211_MESH)
+#elif defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25) || 1
+# if defined(CONFIG_MAC80211_MESH) || 1
 #  define LL_MAX_HEADER 128
 # else
 #  define LL_MAX_HEADER 96
ref='/cgit.cgi/connectbot-yubikey/open-keychain/'>connectbot-yubikey/open-keychain</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='7c4bbc83cbe6a65edb8cd6a4cccb6c9867454f9e'/><select name='h' onchange='this.form.submit();'>
<option value='master' selected='selected'>master</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>open-keychain with patches to support ssh authentication</td><td class='sub right'>James</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit.cgi/connectbot-yubikey/open-keychain/about/'>about</a><a href='/cgit.cgi/connectbot-yubikey/open-keychain/'>summary</a><a href='/cgit.cgi/connectbot-yubikey/open-keychain/refs/?id=7c4bbc83cbe6a65edb8cd6a4cccb6c9867454f9e'>refs</a><a href='/cgit.cgi/connectbot-yubikey/open-keychain/log/prepare-tests.sh'>log</a><a class='active' href='/cgit.cgi/connectbot-yubikey/open-keychain/tree/prepare-tests.sh?id=7c4bbc83cbe6a65edb8cd6a4cccb6c9867454f9e'>tree</a><a href='/cgit.cgi/connectbot-yubikey/open-keychain/commit/prepare-tests.sh?id=7c4bbc83cbe6a65edb8cd6a4cccb6c9867454f9e'>commit</a><a href='/cgit.cgi/connectbot-yubikey/open-keychain/diff/prepare-tests.sh?id=7c4bbc83cbe6a65edb8cd6a4cccb6c9867454f9e'>diff</a><a href='/cgit.cgi/connectbot-yubikey/open-keychain/stats/prepare-tests.sh'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/connectbot-yubikey/open-keychain/log/prepare-tests.sh'>
<input type='hidden' name='id' value='7c4bbc83cbe6a65edb8cd6a4cccb6c9867454f9e'/><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/connectbot-yubikey/open-keychain/tree/?id=7c4bbc83cbe6a65edb8cd6a4cccb6c9867454f9e'>root</a>/<a href='/cgit.cgi/connectbot-yubikey/open-keychain/tree/prepare-tests.sh?id=7c4bbc83cbe6a65edb8cd6a4cccb6c9867454f9e'>prepare-tests.sh</a></div><div class='content'>blob: 027c76f84193a3ed935cffdb67d911cd759cfe23 (<a href='/cgit.cgi/connectbot-yubikey/open-keychain/plain/prepare-tests.sh?id=7c4bbc83cbe6a65edb8cd6a4cccb6c9867454f9e'>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>
</pre></td>
<td class='lines'><pre><code>