|
@@ -4344,7 +4344,6 @@ err:
|
|
|
|
|
|
static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
|
|
static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
|
|
{
|
|
{
|
|
- const struct tcphdr *th = tcp_hdr(skb);
|
|
|
|
struct tcp_sock *tp = tcp_sk(sk);
|
|
struct tcp_sock *tp = tcp_sk(sk);
|
|
int eaten = -1;
|
|
int eaten = -1;
|
|
bool fragstolen = false;
|
|
bool fragstolen = false;
|
|
@@ -4353,7 +4352,7 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
|
|
goto drop;
|
|
goto drop;
|
|
|
|
|
|
skb_dst_drop(skb);
|
|
skb_dst_drop(skb);
|
|
- __skb_pull(skb, th->doff * 4);
|
|
|
|
|
|
+ __skb_pull(skb, tcp_hdr(skb)->doff * 4);
|
|
|
|
|
|
TCP_ECN_accept_cwr(tp, skb);
|
|
TCP_ECN_accept_cwr(tp, skb);
|
|
|
|
|
|
@@ -4397,7 +4396,7 @@ queue_and_out:
|
|
tp->rcv_nxt = TCP_SKB_CB(skb)->end_seq;
|
|
tp->rcv_nxt = TCP_SKB_CB(skb)->end_seq;
|
|
if (skb->len)
|
|
if (skb->len)
|
|
tcp_event_data_recv(sk, skb);
|
|
tcp_event_data_recv(sk, skb);
|
|
- if (th->fin)
|
|
|
|
|
|
+ if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN)
|
|
tcp_fin(sk);
|
|
tcp_fin(sk);
|
|
|
|
|
|
if (!skb_queue_empty(&tp->out_of_order_queue)) {
|
|
if (!skb_queue_empty(&tp->out_of_order_queue)) {
|