0cd478518f
Fixes a regression on spi flash devices (upstream commit 1583eaece6fa). Changelogs: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.7 * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.8 * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.9 * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.10 096-ipv4-off-by-one-in-continuation-handling-in-proc-net.patch was applied upstream and dropped. Signed-off-by: Mathias Kresin <openwrt@kresin.me> [update from 4.1.9 to 4.1.10] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 47104
12 lines
377 B
Diff
12 lines
377 B
Diff
--- a/include/linux/skbuff.h
|
|
+++ b/include/linux/skbuff.h
|
|
@@ -2027,7 +2027,7 @@ static inline int pskb_network_may_pull(
|
|
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
|
|
*/
|
|
#ifndef NET_SKB_PAD
|
|
-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
|
|
+#define NET_SKB_PAD max(64, L1_CACHE_BYTES)
|
|
#endif
|
|
|
|
int ___pskb_trim(struct sk_buff *skb, unsigned int len);
|