diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-04-11 17:34:46 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-15 11:32:47 +0200 |
commit | 6b0d9bf36191b5121eec77955739fa97610ed554 (patch) | |
tree | b8bb1d9b465a13f07766c4cfbb20dfcd47e3ca2a /backport/backport-include/linux/skbuff.h | |
parent | 6dcd6bf4f82013f306550c4695dffbd95f8519c0 (diff) |
backports: dissolve compat-2.6.33.h
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'backport/backport-include/linux/skbuff.h')
-rw-r--r-- | backport/backport-include/linux/skbuff.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h index 5107f654..e7f667eb 100644 --- a/backport/backport-include/linux/skbuff.h +++ b/backport/backport-include/linux/skbuff.h @@ -102,4 +102,19 @@ static inline void skb_tx_timestamp(struct sk_buff *skb) } #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33) +/* mask netdev_alloc_skb_ip_align as debian squeeze also backports this */ +#define netdev_alloc_skb_ip_align LINUX_BACKPORT(netdev_alloc_skb_ip_align) + +static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev, + unsigned int length) +{ + struct sk_buff *skb = netdev_alloc_skb(dev, length + NET_IP_ALIGN); + + if (NET_IP_ALIGN && skb) + skb_reserve(skb, NET_IP_ALIGN); + return skb; +} +#endif + #endif /* __BACKPORT_SKBUFF_H */ |