aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-04-11 18:15:15 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-04-11 18:15:15 +0000
commit2a018eb3806d5ea13e16dbf629b2c7e4fa541b51 (patch)
treecb776e8b62bdb71cd3834275ae79db8bc83c107c /target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch
parentde18353622a4d245f8b407a6f214cfbe53ec9706 (diff)
downloadupstream-2a018eb3806d5ea13e16dbf629b2c7e4fa541b51.tar.gz
upstream-2a018eb3806d5ea13e16dbf629b2c7e4fa541b51.tar.bz2
upstream-2a018eb3806d5ea13e16dbf629b2c7e4fa541b51.zip
refresh 2.6.33 patches for 2.6.33.2
SVN-Revision: 20803
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch b/target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch
index bee41a4a63..0928464ec9 100644
--- a/target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch
+++ b/target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch
@@ -1,6 +1,6 @@
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -1378,11 +1378,18 @@ static inline int skb_network_offset(con
+@@ -1373,11 +1373,18 @@ static inline int skb_network_offset(con
*
* Various parts of the networking layer expect at least 32 bytes of
* headroom, you should not reduce this.
@@ -19,7 +19,7 @@
extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
-@@ -1472,9 +1479,9 @@ static inline void __skb_queue_purge(str
+@@ -1467,9 +1474,9 @@ static inline void __skb_queue_purge(str
static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
gfp_t gfp_mask)
{
@@ -31,7 +31,7 @@
return skb;
}
-@@ -1557,7 +1564,7 @@ static inline int __skb_cow(struct sk_bu
+@@ -1552,7 +1559,7 @@ static inline int __skb_cow(struct sk_bu
delta = headroom - skb_headroom(skb);
if (delta || cloned)