From patchwork Tue Jul 22 13:36:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sorin Dumitru X-Patchwork-Id: 372478 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5B3C9140142 for ; Tue, 22 Jul 2014 23:36:25 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754168AbaGVNgV (ORCPT ); Tue, 22 Jul 2014 09:36:21 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:63125 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751823AbaGVNgU (ORCPT ); Tue, 22 Jul 2014 09:36:20 -0400 Received: by mail-wi0-f176.google.com with SMTP id bs8so6028121wib.3 for ; Tue, 22 Jul 2014 06:36:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Mh5a+LHYntH+IToU4Bda2uH2RQNmdtNdj4H5nYLMTuo=; b=lwKf+s33+jw75H1h4rfBXWRgGgXoaVl5TB+w4ymOHn60wr44cb7Q6GdCaVPBTpbQa/ sr1nURGndUZbLXuElmVLkopFCrmKIIUFWSYzPmqWxVkyoyTKwOWiCnGFSNQnqZzyaC7j ZWmSyb0RP3yk1G67DPRoSmZj9GFAw80ONZ13nZv77vmOXpotGvuXnKJ2ETNLUiK30Ttd L3PhWFtqJXq27wYLW8HXT499OOKmSuic6psbtpUDIXzDJtAgRRVAOnS3As/6k2hoQPFC HYihQzoFHSMC68zo+q1TLySH1wJqDRE9Ha4OaqGil7OZURpVXiRl19HkK3fiVjq+IEbV tERQ== X-Gm-Message-State: ALoCoQnoACo/1F6tiX2eU+BZ7Oir2+g3U8lhkocWzJegaxiHmwA2dot/YdtYg5aTNzm5umSnkTV1 X-Received: by 10.194.79.135 with SMTP id j7mr14348250wjx.56.1406036177486; Tue, 22 Jul 2014 06:36:17 -0700 (PDT) Received: from nibble.ixiacom.com ([86.120.81.154]) by mx.google.com with ESMTPSA id bx2sm1034811wjb.47.2014.07.22.06.36.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Jul 2014 06:36:17 -0700 (PDT) From: Sorin Dumitru To: netdev@vger.kernel.org Cc: eric.dumazet@gmail.com, davem@davemloft.net, Sorin Dumitru Subject: [PATCH net-next] sock: remove skb argument from sk_rcvqueues_full Date: Tue, 22 Jul 2014 16:36:12 +0300 Message-Id: <1406036172-16573-1-git-send-email-sorin@returnze.ro> X-Mailer: git-send-email 2.0.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It hasn't been used since commit 0fd7bac. Signed-off-by: Sorin Dumitru --- include/net/sock.h | 5 ++--- net/core/sock.c | 2 +- net/ipv4/udp.c | 2 +- net/ipv6/udp.c | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index 28f7346..7207733 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -810,8 +810,7 @@ static inline void __sk_add_backlog(struct sock *sk, struct sk_buff *skb) * Do not take into account this skb truesize, * to allow even a single big packet to come. */ -static inline bool sk_rcvqueues_full(const struct sock *sk, const struct sk_buff *skb, - unsigned int limit) +static inline bool sk_rcvqueues_full(const struct sock *sk, unsigned int limit) { unsigned int qsize = sk->sk_backlog.len + atomic_read(&sk->sk_rmem_alloc); @@ -822,7 +821,7 @@ static inline bool sk_rcvqueues_full(const struct sock *sk, const struct sk_buff static inline __must_check int sk_add_backlog(struct sock *sk, struct sk_buff *skb, unsigned int limit) { - if (sk_rcvqueues_full(sk, skb, limit)) + if (sk_rcvqueues_full(sk, limit)) return -ENOBUFS; __sk_add_backlog(sk, skb); diff --git a/net/core/sock.c b/net/core/sock.c index 026e01f..ca9b651 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -491,7 +491,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested) skb->dev = NULL; - if (sk_rcvqueues_full(sk, skb, sk->sk_rcvbuf)) { + if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) { atomic_inc(&sk->sk_drops); goto discard_and_relse; } diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index f31053b..f57c0e4 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1567,7 +1567,7 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) goto csum_error; - if (sk_rcvqueues_full(sk, skb, sk->sk_rcvbuf)) { + if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) { UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS, is_udplite); goto drop; diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index f9d8800..5b6091d 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -673,7 +673,7 @@ int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) goto csum_error; } - if (sk_rcvqueues_full(sk, skb, sk->sk_rcvbuf)) { + if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) { UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS, is_udplite); goto drop;