diff options
Diffstat (limited to 'include/linux/skbuff.h')
-rw-r--r-- | include/linux/skbuff.h | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 14ec16d2d9ba..a05a5f7c0b73 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -22,12 +22,10 @@ | |||
22 | #include <asm/atomic.h> | 22 | #include <asm/atomic.h> |
23 | #include <asm/types.h> | 23 | #include <asm/types.h> |
24 | #include <linux/spinlock.h> | 24 | #include <linux/spinlock.h> |
25 | #include <linux/mm.h> | ||
26 | #include <linux/highmem.h> | ||
27 | #include <linux/poll.h> | ||
28 | #include <linux/net.h> | 25 | #include <linux/net.h> |
29 | #include <linux/textsearch.h> | 26 | #include <linux/textsearch.h> |
30 | #include <net/checksum.h> | 27 | #include <net/checksum.h> |
28 | #include <linux/rcupdate.h> | ||
31 | #include <linux/dmaengine.h> | 29 | #include <linux/dmaengine.h> |
32 | 30 | ||
33 | #define HAVE_ALLOC_SKB /* For the drivers to know */ | 31 | #define HAVE_ALLOC_SKB /* For the drivers to know */ |
@@ -1295,24 +1293,6 @@ static inline int pskb_trim_rcsum(struct sk_buff *skb, unsigned int len) | |||
1295 | return __pskb_trim(skb, len); | 1293 | return __pskb_trim(skb, len); |
1296 | } | 1294 | } |
1297 | 1295 | ||
1298 | static inline void *kmap_skb_frag(const skb_frag_t *frag) | ||
1299 | { | ||
1300 | #ifdef CONFIG_HIGHMEM | ||
1301 | BUG_ON(in_irq()); | ||
1302 | |||
1303 | local_bh_disable(); | ||
1304 | #endif | ||
1305 | return kmap_atomic(frag->page, KM_SKB_DATA_SOFTIRQ); | ||
1306 | } | ||
1307 | |||
1308 | static inline void kunmap_skb_frag(void *vaddr) | ||
1309 | { | ||
1310 | kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ); | ||
1311 | #ifdef CONFIG_HIGHMEM | ||
1312 | local_bh_enable(); | ||
1313 | #endif | ||
1314 | } | ||
1315 | |||
1316 | #define skb_queue_walk(queue, skb) \ | 1296 | #define skb_queue_walk(queue, skb) \ |
1317 | for (skb = (queue)->next; \ | 1297 | for (skb = (queue)->next; \ |
1318 | prefetch(skb->next), (skb != (struct sk_buff *)(queue)); \ | 1298 | prefetch(skb->next), (skb != (struct sk_buff *)(queue)); \ |