aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/core/skbuff.c4
-rw-r--r--net/ipv4/tcp.c4
-rw-r--r--net/ipv4/tcp_output.c10
3 files changed, 9 insertions, 9 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 06a8feb10099..512dc7dcbc32 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -3179,7 +3179,7 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)
3179 skb_shinfo(nskb)->frag_list = p; 3179 skb_shinfo(nskb)->frag_list = p;
3180 skb_shinfo(nskb)->gso_size = pinfo->gso_size; 3180 skb_shinfo(nskb)->gso_size = pinfo->gso_size;
3181 pinfo->gso_size = 0; 3181 pinfo->gso_size = 0;
3182 skb_header_release(p); 3182 __skb_header_release(p);
3183 NAPI_GRO_CB(nskb)->last = p; 3183 NAPI_GRO_CB(nskb)->last = p;
3184 3184
3185 nskb->data_len += p->len; 3185 nskb->data_len += p->len;
@@ -3211,7 +3211,7 @@ merge:
3211 else 3211 else
3212 NAPI_GRO_CB(p)->last->next = skb; 3212 NAPI_GRO_CB(p)->last->next = skb;
3213 NAPI_GRO_CB(p)->last = skb; 3213 NAPI_GRO_CB(p)->last = skb;
3214 skb_header_release(skb); 3214 __skb_header_release(skb);
3215 lp = p; 3215 lp = p;
3216 3216
3217done: 3217done:
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 070aeff1b131..553b01f52f71 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -609,7 +609,7 @@ static inline bool forced_push(const struct tcp_sock *tp)
609 return after(tp->write_seq, tp->pushed_seq + (tp->max_window >> 1)); 609 return after(tp->write_seq, tp->pushed_seq + (tp->max_window >> 1));
610} 610}
611 611
612static inline void skb_entail(struct sock *sk, struct sk_buff *skb) 612static void skb_entail(struct sock *sk, struct sk_buff *skb)
613{ 613{
614 struct tcp_sock *tp = tcp_sk(sk); 614 struct tcp_sock *tp = tcp_sk(sk);
615 struct tcp_skb_cb *tcb = TCP_SKB_CB(skb); 615 struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);
@@ -618,7 +618,7 @@ static inline void skb_entail(struct sock *sk, struct sk_buff *skb)
618 tcb->seq = tcb->end_seq = tp->write_seq; 618 tcb->seq = tcb->end_seq = tp->write_seq;
619 tcb->tcp_flags = TCPHDR_ACK; 619 tcb->tcp_flags = TCPHDR_ACK;
620 tcb->sacked = 0; 620 tcb->sacked = 0;
621 skb_header_release(skb); 621 __skb_header_release(skb);
622 tcp_add_write_queue_tail(sk, skb); 622 tcp_add_write_queue_tail(sk, skb);
623 sk->sk_wmem_queued += skb->truesize; 623 sk->sk_wmem_queued += skb->truesize;
624 sk_mem_charge(sk, skb->truesize); 624 sk_mem_charge(sk, skb->truesize);
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 8c61a7c0c889..f173b1c4f815 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -995,7 +995,7 @@ static void tcp_queue_skb(struct sock *sk, struct sk_buff *skb)
995 995
996 /* Advance write_seq and place onto the write_queue. */ 996 /* Advance write_seq and place onto the write_queue. */
997 tp->write_seq = TCP_SKB_CB(skb)->end_seq; 997 tp->write_seq = TCP_SKB_CB(skb)->end_seq;
998 skb_header_release(skb); 998 __skb_header_release(skb);
999 tcp_add_write_queue_tail(sk, skb); 999 tcp_add_write_queue_tail(sk, skb);
1000 sk->sk_wmem_queued += skb->truesize; 1000 sk->sk_wmem_queued += skb->truesize;
1001 sk_mem_charge(sk, skb->truesize); 1001 sk_mem_charge(sk, skb->truesize);
@@ -1167,7 +1167,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len,
1167 } 1167 }
1168 1168
1169 /* Link BUFF into the send queue. */ 1169 /* Link BUFF into the send queue. */
1170 skb_header_release(buff); 1170 __skb_header_release(buff);
1171 tcp_insert_write_queue_after(skb, buff, sk); 1171 tcp_insert_write_queue_after(skb, buff, sk);
1172 1172
1173 return 0; 1173 return 0;
@@ -1671,7 +1671,7 @@ static int tso_fragment(struct sock *sk, struct sk_buff *skb, unsigned int len,
1671 tcp_set_skb_tso_segs(sk, buff, mss_now); 1671 tcp_set_skb_tso_segs(sk, buff, mss_now);
1672 1672
1673 /* Link BUFF into the send queue. */ 1673 /* Link BUFF into the send queue. */
1674 skb_header_release(buff); 1674 __skb_header_release(buff);
1675 tcp_insert_write_queue_after(skb, buff, sk); 1675 tcp_insert_write_queue_after(skb, buff, sk);
1676 1676
1677 return 0; 1677 return 0;
@@ -2772,7 +2772,7 @@ int tcp_send_synack(struct sock *sk)
2772 if (nskb == NULL) 2772 if (nskb == NULL)
2773 return -ENOMEM; 2773 return -ENOMEM;
2774 tcp_unlink_write_queue(skb, sk); 2774 tcp_unlink_write_queue(skb, sk);
2775 skb_header_release(nskb); 2775 __skb_header_release(nskb);
2776 __tcp_add_write_queue_head(sk, nskb); 2776 __tcp_add_write_queue_head(sk, nskb);
2777 sk_wmem_free_skb(sk, skb); 2777 sk_wmem_free_skb(sk, skb);
2778 sk->sk_wmem_queued += nskb->truesize; 2778 sk->sk_wmem_queued += nskb->truesize;
@@ -2947,7 +2947,7 @@ static void tcp_connect_queue_skb(struct sock *sk, struct sk_buff *skb)
2947 struct tcp_skb_cb *tcb = TCP_SKB_CB(skb); 2947 struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);
2948 2948
2949 tcb->end_seq += skb->len; 2949 tcb->end_seq += skb->len;
2950 skb_header_release(skb); 2950 __skb_header_release(skb);
2951 __tcp_add_write_queue_tail(sk, skb); 2951 __tcp_add_write_queue_tail(sk, skb);
2952 sk->sk_wmem_queued += skb->truesize; 2952 sk->sk_wmem_queued += skb->truesize;
2953 sk_mem_charge(sk, skb->truesize); 2953 sk_mem_charge(sk, skb->truesize);