diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-10-28 18:59:39 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-10-28 18:59:39 +0000 |
| commit | b783fb21a53535cf043189b0c4c30f315f494bb5 (patch) | |
| tree | bb180a1650aef67204581be635aead20adfb2021 /target/linux/generic/patches-3.6/721-phy_packets.patch | |
| parent | 1517cc75d20dcca47f9dd3b5d7457fec9bba5e83 (diff) | |
| download | upstream-b783fb21a53535cf043189b0c4c30f315f494bb5.tar.gz upstream-b783fb21a53535cf043189b0c4c30f315f494bb5.tar.bz2 upstream-b783fb21a53535cf043189b0c4c30f315f494bb5.zip | |
kernel: update linux 3.6 to 3.6.4
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33982 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/721-phy_packets.patch')
| -rw-r--r-- | target/linux/generic/patches-3.6/721-phy_packets.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.6/721-phy_packets.patch b/target/linux/generic/patches-3.6/721-phy_packets.patch index e8578de57a..3a0fdc95b3 100644 --- a/target/linux/generic/patches-3.6/721-phy_packets.patch +++ b/target/linux/generic/patches-3.6/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 -@@ -1656,6 +1656,10 @@ static inline int pskb_trim(struct sk_bu +@@ -1653,6 +1653,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 -@@ -1758,16 +1762,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -1755,16 +1759,6 @@ static inline struct sk_buff *dev_alloc_ } |