kernel: update kernel 4.1 to version 4.1.20

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 49035
This commit is contained in:
Hauke Mehrtens
2016-03-18 23:41:21 +00:00
parent 6d933987db
commit fcbc97ad78
32 changed files with 190 additions and 188 deletions

View File

@@ -41,7 +41,7 @@
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2058,6 +2058,10 @@ static inline int pskb_trim(struct sk_bu
@@ -2059,6 +2059,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}
@@ -52,7 +52,7 @@
/**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter
@@ -2184,16 +2188,6 @@ static inline struct sk_buff *dev_alloc_
@@ -2185,16 +2189,6 @@ static inline struct sk_buff *dev_alloc_
}
@@ -86,7 +86,7 @@
help
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2645,10 +2645,20 @@ static int xmit_one(struct sk_buff *skb,
@@ -2650,10 +2650,20 @@ static int xmit_one(struct sk_buff *skb,
if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all))
dev_queue_xmit_nit(skb, dev);
@@ -121,7 +121,7 @@
#include <net/protocol.h>
#include <net/dst.h>
@@ -568,6 +569,22 @@ struct sk_buff *__napi_alloc_skb(struct
@@ -570,6 +571,22 @@ struct sk_buff *__napi_alloc_skb(struct
}
EXPORT_SYMBOL(__napi_alloc_skb);