diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-04-13 19:37:15 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-04-13 19:37:15 +0000 |
| commit | 62f0c3793b6379d47b23543a625df8ef6d550ca5 (patch) | |
| tree | 5871a8370d0291b47408db3399a8e40f45256a34 /target/linux/generic/patches-2.6.31/205-skb_padding.patch | |
| parent | 6af575967c780fa41029bdb64fdd68646ab516d1 (diff) | |
| download | upstream-62f0c3793b6379d47b23543a625df8ef6d550ca5.tar.gz upstream-62f0c3793b6379d47b23543a625df8ef6d550ca5.tar.bz2 upstream-62f0c3793b6379d47b23543a625df8ef6d550ca5.zip | |
kernel: refresh patches
SVN-Revision: 31279
Diffstat (limited to 'target/linux/generic/patches-2.6.31/205-skb_padding.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.31/205-skb_padding.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.31/205-skb_padding.patch b/target/linux/generic/patches-2.6.31/205-skb_padding.patch index 80c7e704e8..e65a8c6f75 100644 --- a/target/linux/generic/patches-2.6.31/205-skb_padding.patch +++ b/target/linux/generic/patches-2.6.31/205-skb_padding.patch @@ -1,6 +1,6 @@ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -1387,11 +1387,18 @@ static inline int skb_network_offset(con +@@ -1369,11 +1369,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) -@@ -1481,9 +1488,9 @@ static inline void __skb_queue_purge(str +@@ -1463,9 +1470,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; } -@@ -1556,7 +1563,7 @@ static inline int __skb_cow(struct sk_bu +@@ -1538,7 +1545,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 +@@ -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; |