diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2014-02-13 12:57:36 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2014-02-13 12:57:36 +0000 |
| commit | 87573f9583f900bc82fe435ebbcff8dd72c88205 (patch) | |
| tree | 2f9a80173d0873fc7198b0ed4138f4d734555c97 /target/linux/generic/patches-3.12/721-phy_packets.patch | |
| parent | 23122cc26eed5dca0dde4814551da2c9395979c4 (diff) | |
| download | upstream-87573f9583f900bc82fe435ebbcff8dd72c88205.tar.gz upstream-87573f9583f900bc82fe435ebbcff8dd72c88205.tar.bz2 upstream-87573f9583f900bc82fe435ebbcff8dd72c88205.zip | |
[generic]: upgrade 3.12 to 3.12.10
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39581 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.12/721-phy_packets.patch')
| -rw-r--r-- | target/linux/generic/patches-3.12/721-phy_packets.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.12/721-phy_packets.patch b/target/linux/generic/patches-3.12/721-phy_packets.patch index 9363ad125e..47649195d5 100644 --- a/target/linux/generic/patches-3.12/721-phy_packets.patch +++ b/target/linux/generic/patches-3.12/721-phy_packets.patch @@ -34,7 +34,7 @@ #define IF_GET_IFACE 0x0001 /* for querying only */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -1771,6 +1771,10 @@ static inline int pskb_trim(struct sk_bu +@@ -1776,6 +1776,10 @@ static inline int pskb_trim(struct sk_bu return (len < skb->len) ? __pskb_trim(skb, len) : 0; } @@ -45,7 +45,7 @@ /** * pskb_trim_unique - remove end from a paged unique (not cloned) buffer * @skb: buffer to alter -@@ -1898,16 +1902,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -1903,16 +1907,6 @@ static inline struct sk_buff *dev_alloc_ } |