diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2015-05-26 09:31:16 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2015-05-26 09:31:16 +0000 |
| commit | 588acc2cbae61c31b6eabd19e55fcb48c653d87a (patch) | |
| tree | f26bf8a48afd178778540f4d077b203b902cb3e1 /target/linux/generic/patches-4.0/721-phy_packets.patch | |
| parent | df23709f165b2e74e398080f1c0706d011263412 (diff) | |
| download | upstream-588acc2cbae61c31b6eabd19e55fcb48c653d87a.tar.gz upstream-588acc2cbae61c31b6eabd19e55fcb48c653d87a.tar.bz2 upstream-588acc2cbae61c31b6eabd19e55fcb48c653d87a.zip | |
generic/4.0: update to 4.0.4
Update kernel sources and refresh some patches.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 45761
Diffstat (limited to 'target/linux/generic/patches-4.0/721-phy_packets.patch')
| -rw-r--r-- | target/linux/generic/patches-4.0/721-phy_packets.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-4.0/721-phy_packets.patch b/target/linux/generic/patches-4.0/721-phy_packets.patch index 0f9e2f1c12..f3ee62661e 100644 --- a/target/linux/generic/patches-4.0/721-phy_packets.patch +++ b/target/linux/generic/patches-4.0/721-phy_packets.patch @@ -41,7 +41,7 @@ */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2057,6 +2057,10 @@ static inline int pskb_trim(struct sk_bu +@@ -2058,6 +2058,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 -@@ -2183,16 +2187,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -2184,16 +2188,6 @@ static inline struct sk_buff *dev_alloc_ } @@ -121,7 +121,7 @@ #include <net/protocol.h> #include <net/dst.h> -@@ -550,6 +551,22 @@ struct sk_buff *__napi_alloc_skb(struct +@@ -568,6 +569,22 @@ struct sk_buff *__napi_alloc_skb(struct } EXPORT_SYMBOL(__napi_alloc_skb); |