summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.32/205-skb_padding.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-02-21 02:06:51 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-02-21 02:06:51 +0000
commit9dad83362db3aac6c7496e66e948daa88554f8b4 (patch)
tree0ee7826acec4817f98f5e5bcbcaa3ba79bad0272 /target/linux/generic/patches-2.6.32/205-skb_padding.patch
parentfca74c3a44ec734916a39e979e8f0286accbe7d0 (diff)
downloadmaster-31e0f0ae-9dad83362db3aac6c7496e66e948daa88554f8b4.tar.gz
master-31e0f0ae-9dad83362db3aac6c7496e66e948daa88554f8b4.tar.bz2
master-31e0f0ae-9dad83362db3aac6c7496e66e948daa88554f8b4.zip
kernel: remove imq support, refresh patches
SVN-Revision: 25641
Diffstat (limited to 'target/linux/generic/patches-2.6.32/205-skb_padding.patch')
-rw-r--r--target/linux/generic/patches-2.6.32/205-skb_padding.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.32/205-skb_padding.patch b/target/linux/generic/patches-2.6.32/205-skb_padding.patch
index face44c0a3..2405f5936a 100644
--- a/target/linux/generic/patches-2.6.32/205-skb_padding.patch
+++ b/target/linux/generic/patches-2.6.32/205-skb_padding.patch
@@ -1,6 +1,6 @@
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -1384,11 +1384,18 @@ static inline int skb_network_offset(con
+@@ -1365,11 +1365,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)
-@@ -1478,9 +1485,9 @@ static inline void __skb_queue_purge(str
+@@ -1459,9 +1466,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;
}
-@@ -1553,7 +1560,7 @@ static inline int __skb_cow(struct sk_bu
+@@ -1534,7 +1541,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
-@@ -339,9 +339,9 @@ struct sk_buff *__netdev_alloc_skb(struc
+@@ -259,9 +259,9 @@ struct sk_buff *__netdev_alloc_skb(struc
int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
struct sk_buff *skb;