diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/dccp/proto.c | 4 | ||||
-rw-r--r-- | net/ipv4/tcp.c | 8 | ||||
-rw-r--r-- | net/llc/af_llc.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index 2e0ee8355c41..5317fd3e6691 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c | |||
@@ -719,7 +719,7 @@ int dccp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, | |||
719 | } | 719 | } |
720 | dccp_pr_debug("packet_type=%s\n", | 720 | dccp_pr_debug("packet_type=%s\n", |
721 | dccp_packet_name(dh->dccph_type)); | 721 | dccp_packet_name(dh->dccph_type)); |
722 | sk_eat_skb(sk, skb); | 722 | sk_eat_skb(sk, skb, 0); |
723 | verify_sock_status: | 723 | verify_sock_status: |
724 | if (sock_flag(sk, SOCK_DONE)) { | 724 | if (sock_flag(sk, SOCK_DONE)) { |
725 | len = 0; | 725 | len = 0; |
@@ -773,7 +773,7 @@ verify_sock_status: | |||
773 | } | 773 | } |
774 | found_fin_ok: | 774 | found_fin_ok: |
775 | if (!(flags & MSG_PEEK)) | 775 | if (!(flags & MSG_PEEK)) |
776 | sk_eat_skb(sk, skb); | 776 | sk_eat_skb(sk, skb, 0); |
777 | break; | 777 | break; |
778 | } while (1); | 778 | } while (1); |
779 | out: | 779 | out: |
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 | ||
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index 5a04db745c8d..7465170a36ca 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c | |||
@@ -789,7 +789,7 @@ static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
789 | continue; | 789 | continue; |
790 | 790 | ||
791 | if (!(flags & MSG_PEEK)) { | 791 | if (!(flags & MSG_PEEK)) { |
792 | sk_eat_skb(sk, skb); | 792 | sk_eat_skb(sk, skb, 0); |
793 | *seq = 0; | 793 | *seq = 0; |
794 | } | 794 | } |
795 | } while (len > 0); | 795 | } while (len > 0); |