aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.32/205-skb_padding.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2010-01-30 20:52:37 +0000
committerImre Kaloz <kaloz@openwrt.org>2010-01-30 20:52:37 +0000
commit4aadb74cc14887ab9d948203dea8617623d43a7e (patch)
treea6efa57dd1dd25a73d1df82fc6ddee5451ecb74e /target/linux/generic-2.6/patches-2.6.32/205-skb_padding.patch
parentd33454d86d26759bb8135a3af038393d6b15cf46 (diff)
downloadupstream-4aadb74cc14887ab9d948203dea8617623d43a7e.tar.gz
upstream-4aadb74cc14887ab9d948203dea8617623d43a7e.tar.bz2
upstream-4aadb74cc14887ab9d948203dea8617623d43a7e.zip
upgrade IMQ patch to the latest one, refresh patches
SVN-Revision: 19431
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.32/205-skb_padding.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/205-skb_padding.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.32/205-skb_padding.patch b/target/linux/generic-2.6/patches-2.6.32/205-skb_padding.patch
index 948c0b2d4f..face44c0a3 100644
--- a/target/linux/generic-2.6/patches-2.6.32/205-skb_padding.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/205-skb_padding.patch
@@ -1,6 +1,6 @@
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -1383,11 +1383,18 @@ static inline int skb_network_offset(con
+@@ -1384,11 +1384,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)
-@@ -1477,9 +1484,9 @@ static inline void __skb_queue_purge(str
+@@ -1478,9 +1485,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;
}
-@@ -1552,7 +1559,7 @@ static inline int __skb_cow(struct sk_bu
+@@ -1553,7 +1560,7 @@ static inline int __skb_cow(struct sk_bu
delta = headroom - skb_headroom(skb);
if (delta || cloned)
@@ -42,7 +42,7 @@
}
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
-@@ -336,9 +336,9 @@ struct sk_buff *__netdev_alloc_skb(struc
+@@ -339,9 +339,9 @@ struct sk_buff *__netdev_alloc_skb(struc
int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
struct sk_buff *skb;