diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-04-21 15:18:58 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-04-21 15:18:58 +0000 |
commit | 50610aa86998ad5c6af1b77b82a18dbbf18af2f5 (patch) | |
tree | 257882d0984cba5884defdecf417ce8c09714309 /target/linux/generic/patches-2.6.31/205-skb_padding.patch | |
parent | 2e5d3d2795663d7c3cc88356b307e05f833f4e16 (diff) | |
download | master-31e0f0ae-50610aa86998ad5c6af1b77b82a18dbbf18af2f5.tar.gz master-31e0f0ae-50610aa86998ad5c6af1b77b82a18dbbf18af2f5.tar.bz2 master-31e0f0ae-50610aa86998ad5c6af1b77b82a18dbbf18af2f5.zip |
linux/2.6.31: R.I.P.
SVN-Revision: 31412
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 | 56 |
1 files changed, 0 insertions, 56 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 deleted file mode 100644 index e65a8c6f75..0000000000 --- a/target/linux/generic/patches-2.6.31/205-skb_padding.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/include/linux/skbuff.h -+++ b/include/linux/skbuff.h -@@ -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. -+ * -+ * This has been changed to 64 to acommodate for routing between ethernet -+ * and wireless, but only for new allocations - */ - #ifndef NET_SKB_PAD - #define NET_SKB_PAD 32 - #endif - -+#ifndef NET_SKB_PAD_ALLOC -+#define NET_SKB_PAD_ALLOC 64 -+#endif -+ - extern int ___pskb_trim(struct sk_buff *skb, unsigned int len); - - static inline void __skb_trim(struct sk_buff *skb, unsigned int len) -@@ -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) - { -- struct sk_buff *skb = alloc_skb(length + NET_SKB_PAD, gfp_mask); -+ struct sk_buff *skb = alloc_skb(length + NET_SKB_PAD_ALLOC, gfp_mask); - if (likely(skb)) -- skb_reserve(skb, NET_SKB_PAD); -+ skb_reserve(skb, NET_SKB_PAD_ALLOC); - return skb; - } - -@@ -1538,7 +1545,7 @@ static inline int __skb_cow(struct sk_bu - delta = headroom - skb_headroom(skb); - - if (delta || cloned) -- return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD), 0, -+ return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD_ALLOC), 0, - GFP_ATOMIC); - return 0; - } ---- a/net/core/skbuff.c -+++ b/net/core/skbuff.c -@@ -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; - -- skb = __alloc_skb(length + NET_SKB_PAD, gfp_mask, 0, node); -+ skb = __alloc_skb(length + NET_SKB_PAD_ALLOC, gfp_mask, 0, node); - if (likely(skb)) { -- skb_reserve(skb, NET_SKB_PAD); -+ skb_reserve(skb, NET_SKB_PAD_ALLOC); - skb->dev = dev; - } - return skb; |