netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: <linux-kernel@vger.kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	"David S. Miller" <davem@davemloft.net>,
	Pablo Neira Ayuso <pablo@netfilter.org>,
	"Stephen Hemminger" <stephen@networkplumber.org>,
	Johannes Berg <johannes@sipsolutions.net>,
	"John W. Linville" <linville@tuxdriver.com>,
	Stanislaw Gruszka <sgruszka@redhat.com>,
	Johannes Berg <johannes.berg@intel.com>,
	Francois Romieu <romieu@fr.zoreil.com>,
	"Ben Hutchings" <bhutchings@solarflare.com>,
	Chas Williams <chas@cmf.nrl.navy.mil>,
	Marc Kleine-Budde <mkl@pengutronix.de>,
	Samuel Ortiz <samuel@sortiz.org>,
	Paul Mackerras <paulus@samba.org>,
	Oliver Neukum <oneukum@suse.de>,
	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
	"Boris Ostrovsky" <boris.ostrovsky@oracle.com>,
	David Vrabel <david.vrabel@citrix.com>,
	Rusty Russell <rusty@rustcorp.com.au>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	<netfilter@vger.kernel.org>,
	<netdev@vger.ker
Subject: [PATCH 08/18] atm: use wrapper functions of net_ratelimit() to simplify code
Date: Tue, 15 Oct 2013 19:45:04 +0800	[thread overview]
Message-ID: <1381837514-50660-9-git-send-email-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <1381837514-50660-1-git-send-email-wangkefeng.wang@huawei.com>

net_ratelimited_function() is called to simplify code.

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
 drivers/atm/solos-pci.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index 32784d1..a4d20e9 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -807,8 +807,8 @@ void solos_bh(unsigned long card_arg)
 
 				skb = alloc_skb(size + 1, GFP_ATOMIC);
 				if (!skb) {
-					if (net_ratelimit())
-						dev_warn(&card->dev->dev, "Failed to allocate sk_buff for RX\n");
+					net_ratelimited_function(dev_warn, &card->dev->dev,
+						"Failed to allocate sk_buff for RX\n");
 					continue;
 				}
 
@@ -829,8 +829,8 @@ void solos_bh(unsigned long card_arg)
 				vcc = find_vcc(card->atmdev[port], le16_to_cpu(header->vpi),
 					       le16_to_cpu(header->vci));
 				if (!vcc) {
-					if (net_ratelimit())
-						dev_warn(&card->dev->dev, "Received packet for unknown VPI.VCI %d.%d on port %d\n",
+					net_ratelimited_function(dev_warn, &card->dev->dev,
+						"Received packet for unknown VPI.VCI %d.%d on port %d\n",
 							 le16_to_cpu(header->vpi), le16_to_cpu(header->vci),
 							 port);
 					dev_kfree_skb_any(skb);
@@ -856,9 +856,8 @@ void solos_bh(unsigned long card_arg)
 					break;
 				spin_lock(&card->cli_queue_lock);
 				if (skb_queue_len(&card->cli_queue[port]) > 10) {
-					if (net_ratelimit())
-						dev_warn(&card->dev->dev, "Dropping console response on port %d\n",
-							 port);
+					net_ratelimited_function(dev_warn, &card->dev->dev,
+						"Dropping console response on port %d\n", port);
 					dev_kfree_skb_any(skb);
 				} else
 					skb_queue_tail(&card->cli_queue[port], skb);
@@ -878,8 +877,7 @@ void solos_bh(unsigned long card_arg)
 					  card->config_regs + RX_DMA_ADDR(port));
 				card->rx_skb[port] = skb;
 			} else {
-				if (net_ratelimit())
-					dev_warn(&card->dev->dev, "Failed to allocate RX skb");
+				net_ratelimited_function(dev_warn, &card->dev->dev, "Failed to allocate RX skb");
 
 				/* We'll have to try again later */
 				tasklet_schedule(&card->tlet);
@@ -927,8 +925,8 @@ static int popen(struct atm_vcc *vcc)
 
 	skb = alloc_skb(sizeof(*header), GFP_KERNEL);
 	if (!skb) {
-		if (net_ratelimit())
-			dev_warn(&card->dev->dev, "Failed to allocate sk_buff in popen()\n");
+		net_ratelimited_function(dev_warn, &card->dev->dev,
+			"Failed to allocate sk_buff in popen()\n");
 		return -ENOMEM;
 	}
 	header = (void *)skb_put(skb, sizeof(*header));
-- 
1.8.2.1

  parent reply	other threads:[~2013-10-15 11:45 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-15 11:44 [PATCH 00/18] cleanup: wrapper functions of net_ratelimit() called to simplify code Kefeng Wang
2013-10-15 11:44 ` [PATCH 01/18] netfilter: cleanup: delete Macro PRINTR Kefeng Wang
2013-10-15 11:44 ` [PATCH 02/18] net: use wrapper functions of net_ratelimit() to simplify code Kefeng Wang
2013-10-15 16:24   ` Joe Perches
2013-10-16  3:24     ` Kefeng Wang
2013-10-15 11:44 ` [PATCH 03/18] rt18187se: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 04/18] rt18192e: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 05/18] rt18192u: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 06/18] net: wireless: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 07/18] net: ethernet: " Kefeng Wang
2013-10-15 11:45 ` Kefeng Wang [this message]
2013-10-15 11:45 ` [PATCH 09/18] block: aoe: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 10/18] net: peak_usb: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 11/18] net: hamradio: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 12/18] net: irda: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 13/18] net: ppp: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 14/18] net: usb: " Kefeng Wang
2013-10-15 19:06   ` Sergei Shtylyov
2013-10-16  3:27     ` Kefeng Wang
2013-10-15 11:45 ` [PATCH 15/18] net: xen: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 16/18] net: virtio: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 17/18] net: vxlan: " Kefeng Wang
2013-10-15 11:45 ` [PATCH 18/18] net: wimax: " Kefeng Wang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1381837514-50660-9-git-send-email-wangkefeng.wang@huawei.com \
    --to=wangkefeng.wang@huawei.com \
    --cc=bhutchings@solarflare.com \
    --cc=boris.ostrovsky@oracle.com \
    --cc=chas@cmf.nrl.navy.mil \
    --cc=davem@davemloft.net \
    --cc=david.vrabel@citrix.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=johannes.berg@intel.com \
    --cc=johannes@sipsolutions.net \
    --cc=konrad.wilk@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=mkl@pengutronix.de \
    --cc=mst@redhat.com \
    --cc=netdev@vger.ker \
    --cc=netfilter@vger.kernel.org \
    --cc=oneukum@suse.de \
    --cc=pablo@netfilter.org \
    --cc=paulus@samba.org \
    --cc=romieu@fr.zoreil.com \
    --cc=rusty@rustcorp.com.au \
    --cc=samuel@sortiz.org \
    --cc=sgruszka@redhat.com \
    --cc=stephen@networkplumber.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).