aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorChris Leech <christopher.leech@intel.com>2006-05-23 21:01:28 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-06-18 00:25:52 -0400
commit624d1164730d58a494cc5aa4afa37d02c41e83a7 (patch)
treeb6cc0776a826f8f2611eff41149410c7f4ccb355 /include
parent0e4b4992b8007c6b62ec143cbbb292f98813ca11 (diff)
[I/OAT]: Make sk_eat_skb I/OAT aware.
Add an extra argument to sk_eat_skb, and make it move early copied packets to the async_wait_queue instead of freeing them. Signed-off-by: Chris Leech <christopher.leech@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/net/sock.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index 90c65cb091a8..75b0e97ed93d 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1273,11 +1273,22 @@ sock_recv_timestamp(struct msghdr *msg, struct sock *sk, struct sk_buff *skb)
1273 * This routine must be called with interrupts disabled or with the socket 1273 * This routine must be called with interrupts disabled or with the socket
1274 * locked so that the sk_buff queue operation is ok. 1274 * locked so that the sk_buff queue operation is ok.
1275*/ 1275*/
1276static inline void sk_eat_skb(struct sock *sk, struct sk_buff *skb) 1276#ifdef CONFIG_NET_DMA
1277static inline void sk_eat_skb(struct sock *sk, struct sk_buff *skb, int copied_early)
1278{
1279 __skb_unlink(skb, &sk->sk_receive_queue);
1280 if (!copied_early)
1281 __kfree_skb(skb);
1282 else
1283 __skb_queue_tail(&sk->sk_async_wait_queue, skb);
1284}
1285#else
1286static inline void sk_eat_skb(struct sock *sk, struct sk_buff *skb, int copied_early)
1277{ 1287{
1278 __skb_unlink(skb, &sk->sk_receive_queue); 1288 __skb_unlink(skb, &sk->sk_receive_queue);
1279 __kfree_skb(skb); 1289 __kfree_skb(skb);
1280} 1290}
1291#endif
1281 1292
1282extern void sock_enable_timestamp(struct sock *sk); 1293extern void sock_enable_timestamp(struct sock *sk);
1283extern int sock_get_timestamp(struct sock *, struct timeval __user *); 1294extern int sock_get_timestamp(struct sock *, struct timeval __user *);