diff options
author | Chris Leech <christopher.leech@intel.com> | 2006-05-23 21:01:28 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-06-18 00:25:52 -0400 |
commit | 624d1164730d58a494cc5aa4afa37d02c41e83a7 (patch) | |
tree | b6cc0776a826f8f2611eff41149410c7f4ccb355 /net/ipv4/tcp.c | |
parent | 0e4b4992b8007c6b62ec143cbbb292f98813ca11 (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 'net/ipv4/tcp.c')
-rw-r--r-- | net/ipv4/tcp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 1c0cfd7a8bbb..4e067d25a63c 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -1072,11 +1072,11 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc, | |||
1072 | break; | 1072 | break; |
1073 | } | 1073 | } |
1074 | if (skb->h.th->fin) { | 1074 | if (skb->h.th->fin) { |
1075 | sk_eat_skb(sk, skb); | 1075 | sk_eat_skb(sk, skb, 0); |
1076 | ++seq; | 1076 | ++seq; |
1077 | break; | 1077 | break; |
1078 | } | 1078 | } |
1079 | sk_eat_skb(sk, skb); | 1079 | sk_eat_skb(sk, skb, 0); |
1080 | if (!desc->count) | 1080 | if (!desc->count) |
1081 | break; | 1081 | break; |
1082 | } | 1082 | } |
@@ -1356,14 +1356,14 @@ skip_copy: | |||
1356 | if (skb->h.th->fin) | 1356 | if (skb->h.th->fin) |
1357 | goto found_fin_ok; | 1357 | goto found_fin_ok; |
1358 | if (!(flags & MSG_PEEK)) | 1358 | if (!(flags & MSG_PEEK)) |
1359 | sk_eat_skb(sk, skb); | 1359 | sk_eat_skb(sk, skb, 0); |
1360 | continue; | 1360 | continue; |
1361 | 1361 | ||
1362 | found_fin_ok: | 1362 | found_fin_ok: |
1363 | /* Process the FIN. */ | 1363 | /* Process the FIN. */ |
1364 | ++*seq; | 1364 | ++*seq; |
1365 | if (!(flags & MSG_PEEK)) | 1365 | if (!(flags & MSG_PEEK)) |
1366 | sk_eat_skb(sk, skb); | 1366 | sk_eat_skb(sk, skb, 0); |
1367 | break; | 1367 | break; |
1368 | } while (len > 0); | 1368 | } while (len > 0); |
1369 | 1369 | ||