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
commit6bc191d10c0a59972fdb12ea80bc12275fa85f00 (patch)
tree17cf86f17e6977fd7942d93ecdba2e6df7f1f4b2 /target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch
parentc2044506bdc5e2d09926d2af1fb977551488bd09 (diff)
downloadupstream-6bc191d10c0a59972fdb12ea80bc12275fa85f00.tar.gz
upstream-6bc191d10c0a59972fdb12ea80bc12275fa85f00.tar.bz2
upstream-6bc191d10c0a59972fdb12ea80bc12275fa85f00.zip
[kernel] refresh 2.6.33 patches for 2.6.33.2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20803 3c298f89-4303-0410-b956-a3cf2f4a3e73
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)