aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.28/205-skb_padding.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2009-05-11 20:22:59 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2009-05-11 20:22:59 +0000
commitcc946df3a83eeddd2118c9b861cda0d62947a8f1 (patch)
treef902344a46a3bf7a66ff5f73c756c107d69301fd /target/linux/generic-2.6/patches-2.6.28/205-skb_padding.patch
parent1b481e07088d1a65d5d3439e370467bc6014ce8c (diff)
downloadupstream-cc946df3a83eeddd2118c9b861cda0d62947a8f1.tar.gz
upstream-cc946df3a83eeddd2118c9b861cda0d62947a8f1.tar.bz2
upstream-cc946df3a83eeddd2118c9b861cda0d62947a8f1.zip
Refresh patches.
SVN-Revision: 15776
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.28/205-skb_padding.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/205-skb_padding.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/205-skb_padding.patch b/target/linux/generic-2.6/patches-2.6.28/205-skb_padding.patch
index 855f0fedd5..949f887ad6 100644
--- a/target/linux/generic-2.6/patches-2.6.28/205-skb_padding.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/205-skb_padding.patch
@@ -1,6 +1,6 @@
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -1256,11 +1256,18 @@ static inline int skb_network_offset(con
+@@ -1270,11 +1270,18 @@ static inline int skb_network_offset(con
*
* Various parts of the networking layer expect at least 16 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)
-@@ -1350,9 +1357,9 @@ static inline void __skb_queue_purge(str
+@@ -1364,9 +1371,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;
}
-@@ -1425,7 +1432,7 @@ static inline int __skb_cow(struct sk_bu
+@@ -1439,7 +1446,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
-@@ -243,9 +243,9 @@ struct sk_buff *__netdev_alloc_skb(struc
+@@ -320,9 +320,9 @@ struct sk_buff *__netdev_alloc_skb(struc
int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
struct sk_buff *skb;