diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-04-12 10:55:32 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-15 11:32:46 +0200 |
commit | e6e140378da05b548ab1797cb080ee27883b947d (patch) | |
tree | 7f86a1262b1fc13635a4e283dd165508f8f954ba /backport/backport-include/linux/skbuff.h | |
parent | 0c4d7639748d4a7acca14687e62cf6020d59dca2 (diff) |
backports: dissolve compat-3.2.h
Also get rid of __netdev_printk() as it's no longer
exported from the kernel and thus can't be used by
any drivers/other backported code.
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 | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h index e8ff5aca..113d638a 100644 --- a/backport/backport-include/linux/skbuff.h +++ b/backport/backport-include/linux/skbuff.h @@ -26,4 +26,32 @@ static inline void skb_complete_wifi_ack(struct sk_buff *skb, bool acked) } #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0) +#include <linux/dma-mapping.h> + +/* mask skb_frag_page as RHEL6 backports this */ +#define skb_frag_page LINUX_BACKPORT(skb_frag_page) +static inline struct page *skb_frag_page(const skb_frag_t *frag) +{ + return frag->page; +} + +#define skb_frag_size LINUX_BACKPORT(skb_frag_size) +static inline unsigned int skb_frag_size(const skb_frag_t *frag) +{ + return frag->size; +} + +/* mask skb_frag_dma_map as RHEL6 backports this */ +#define skb_frag_dma_map LINUX_BACKPORT(skb_frag_dma_map) +static inline dma_addr_t skb_frag_dma_map(struct device *dev, + const skb_frag_t *frag, + size_t offset, size_t size, + enum dma_data_direction dir) +{ + return dma_map_page(dev, skb_frag_page(frag), + frag->page_offset + offset, size, dir); +} +#endif + #endif /* __BACKPORT_SKBUFF_H */ |