* [PATCH 17/18] net: vxlan: use wrapper functions of net_ratelimit() to simplify code
From: Kefeng Wang @ 2013-10-15 11:45 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, David S. Miller, Pablo Neira Ayuso,
Stephen Hemminger, Johannes Berg, John W. Linville,
Stanislaw Gruszka, Johannes Berg, Francois Romieu, Ben Hutchings,
Chas Williams, Marc Kleine-Budde, Samuel Ortiz, Paul Mackerras,
Oliver Neukum, Konrad Rzeszutek Wilk, Boris Ostrovsky,
David Vrabel, Rusty Russell, Michael S. Tsirkin, netfilter,
netdev, linux-wireless, guohanjun
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/net/vxlan.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 2ef5b62..56583ab 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -893,8 +893,7 @@ static bool vxlan_snoop(struct net_device *dev,
if (f->state & NUD_NOARP)
return true;
- if (net_ratelimit())
- netdev_info(dev,
+ net_ratelimited_function(netdev_info, dev,
"%pM migrated from %pIS to %pIS\n",
src_mac, &rdst->remote_ip, &src_ip);
--
1.8.2.1
^ permalink raw reply related
* [PATCH 15/18] net: xen: use wrapper functions of net_ratelimit() to simplify code
From: Kefeng Wang @ 2013-10-15 11:45 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, David S. Miller, Pablo Neira Ayuso,
Stephen Hemminger, Johannes Berg, John W. Linville,
Stanislaw Gruszka, Johannes Berg, Francois Romieu, Ben Hutchings,
Chas Williams, Marc Kleine-Budde, Samuel Ortiz, Paul Mackerras,
Oliver Neukum, Konrad Rzeszutek Wilk, Boris Ostrovsky,
David Vrabel, Rusty Russell, Michael S. Tsirkin, netfilter,
netdev, linux-wireless, guohanjun
In-Reply-To: <1381837514-50660-1-git-send-email-wangkefeng.wang@huawei.com>
Wrapper functions net_ratelimited_function() and net_XXX_ratelimited()
are called to simplify code.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
drivers/net/xen-netback/netback.c | 21 +++++++++------------
drivers/net/xen-netfront.c | 27 +++++++++------------------
2 files changed, 18 insertions(+), 30 deletions(-)
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index f3e591c..bceb2ad 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -776,10 +776,9 @@ static int xenvif_count_requests(struct xenvif *vif,
* dropped
*/
if (!drop_err && slots >= XEN_NETBK_LEGACY_SLOTS_MAX) {
- if (net_ratelimit())
- netdev_dbg(vif->dev,
- "Too many slots (%d) exceeding limit (%d), dropping packet\n",
- slots, XEN_NETBK_LEGACY_SLOTS_MAX);
+ net_ratelimited_function(netdev_dbg, vif->dev,
+ "Too many slots (%d) exceeding limit (%d), dropping packet\n",
+ slots, XEN_NETBK_LEGACY_SLOTS_MAX);
drop_err = -E2BIG;
}
@@ -799,10 +798,9 @@ static int xenvif_count_requests(struct xenvif *vif,
* Consume all slots and drop the packet.
*/
if (!drop_err && txp->size > first->size) {
- if (net_ratelimit())
- netdev_dbg(vif->dev,
- "Invalid tx request, slot size %u > remaining size %u\n",
- txp->size, first->size);
+ net_ratelimited_function(netdev_dbg, vif->dev,
+ "Invalid tx request, slot size %u > remaining size %u\n",
+ txp->size, first->size);
drop_err = -EIO;
}
@@ -1170,10 +1168,9 @@ static int checksum_setup(struct xenvif *vif, struct sk_buff *skb)
}
break;
default:
- if (net_ratelimit())
- netdev_err(vif->dev,
- "Attempting to checksum a non-TCP/UDP packet, dropping a protocol %d packet\n",
- iph->protocol);
+ net_ratelimited_function(netdev_err, vif->dev,
+ "Attempting to checksum a non-TCP/UDP packet, dropping a protocol %d packet\n",
+ iph->protocol);
goto out;
}
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 36808bf..11eeef1 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -690,8 +690,7 @@ static int xennet_get_extras(struct netfront_info *np,
grant_ref_t ref;
if (unlikely(cons + 1 == rp)) {
- if (net_ratelimit())
- dev_warn(dev, "Missing extra info\n");
+ net_ratelimited_function(dev_warn, dev, "Missing extra info\n");
err = -EBADR;
break;
}
@@ -701,8 +700,7 @@ static int xennet_get_extras(struct netfront_info *np,
if (unlikely(!extra->type ||
extra->type >= XEN_NETIF_EXTRA_TYPE_MAX)) {
- if (net_ratelimit())
- dev_warn(dev, "Invalid extra type: %d\n",
+ net_ratelimited_function(dev_warn, dev, "Invalid extra type: %d\n",
extra->type);
err = -EINVAL;
} else {
@@ -742,8 +740,7 @@ static int xennet_get_responses(struct netfront_info *np,
for (;;) {
if (unlikely(rx->status < 0 ||
rx->offset + rx->status > PAGE_SIZE)) {
- if (net_ratelimit())
- dev_warn(dev, "rx->offset: %x, size: %u\n",
+ net_ratelimited_function(dev_warn, dev, "rx->offset: %x, size: %u\n",
rx->offset, rx->status);
xennet_move_rx_slot(np, skb, ref);
err = -EINVAL;
@@ -756,8 +753,7 @@ static int xennet_get_responses(struct netfront_info *np,
* situation to the system controller to reboot the backend.
*/
if (ref == GRANT_INVALID_REF) {
- if (net_ratelimit())
- dev_warn(dev, "Bad rx response id %d.\n",
+ net_ratelimited_function(dev_warn, dev, "Bad rx response id %d.\n",
rx->id);
err = -EINVAL;
goto next;
@@ -775,8 +771,7 @@ next:
break;
if (cons + slots == rp) {
- if (net_ratelimit())
- dev_warn(dev, "Need more slots\n");
+ net_ratelimited_function(dev_warn, dev, "Need more slots\n");
err = -ENOENT;
break;
}
@@ -788,8 +783,7 @@ next:
}
if (unlikely(slots > max)) {
- if (net_ratelimit())
- dev_warn(dev, "Too many slots\n");
+ net_ratelimited_function(dev_warn, dev, "Too many slots\n");
err = -E2BIG;
}
@@ -803,15 +797,13 @@ static int xennet_set_skb_gso(struct sk_buff *skb,
struct xen_netif_extra_info *gso)
{
if (!gso->u.gso.size) {
- if (net_ratelimit())
- pr_warn("GSO size must not be zero\n");
+ net_warn_ratelimited("GSO size must not be zero\n");
return -EINVAL;
}
/* Currently only TCPv4 S.O. is supported. */
if (gso->u.gso.type != XEN_NETIF_GSO_TYPE_TCPV4) {
- if (net_ratelimit())
- pr_warn("Bad GSO type %d\n", gso->u.gso.type);
+ net_warn_ratelimited("Bad GSO type %d\n", gso->u.gso.type);
return -EINVAL;
}
@@ -910,8 +902,7 @@ static int checksum_setup(struct net_device *dev, struct sk_buff *skb)
}
break;
default:
- if (net_ratelimit())
- pr_err("Attempting to checksum a non-TCP/UDP packet, dropping a protocol %d packet\n",
+ net_err_ratelimited("Attempting to checksum a non-TCP/UDP packet, dropping a protocol %d packet\n",
iph->protocol);
goto out;
}
--
1.8.2.1
^ permalink raw reply related
* [PATCH 16/18] net: virtio: use wrapper functions of net_ratelimit() to simplify code
From: Kefeng Wang @ 2013-10-15 11:45 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, David S. Miller, Pablo Neira Ayuso,
Stephen Hemminger, Johannes Berg, John W. Linville,
Stanislaw Gruszka, Johannes Berg, Francois Romieu, Ben Hutchings,
Chas Williams, Marc Kleine-Budde, Samuel Ortiz, Paul Mackerras,
Oliver Neukum, Konrad Rzeszutek Wilk, Boris Ostrovsky,
David Vrabel, Rusty Russell, Michael S. Tsirkin, netfilter,
netdev, linux-wireless, guohanjun
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/net/virtio_net.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index defec2b..4f63c12 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -753,8 +753,7 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
/* This should not happen! */
if (unlikely(err)) {
dev->stats.tx_fifo_errors++;
- if (net_ratelimit())
- dev_warn(&dev->dev,
+ net_ratelimited_function(dev_warn, &dev->dev,
"Unexpected TXQ (%d) queue failure: %d\n", qnum, err);
dev->stats.tx_dropped++;
kfree_skb(skb);
--
1.8.2.1
^ permalink raw reply related
* [PATCH 13/18] net: ppp: use wrapper functions of net_ratelimit() to simplify code
From: Kefeng Wang @ 2013-10-15 11:45 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, David S. Miller, Pablo Neira Ayuso,
Stephen Hemminger, Johannes Berg, John W. Linville,
Stanislaw Gruszka, Johannes Berg, Francois Romieu, Ben Hutchings,
Chas Williams, Marc Kleine-Budde, Samuel Ortiz, Paul Mackerras,
Oliver Neukum, Konrad Rzeszutek Wilk, Boris Ostrovsky,
David Vrabel, Rusty Russell, Michael S. Tsirkin, netfilter,
netdev, linux-wireless, guohanjun
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/net/ppp/ppp_generic.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
index 72ff14b..53900cd 100644
--- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
@@ -1125,8 +1125,8 @@ pad_compress_skb(struct ppp *ppp, struct sk_buff *skb)
ppp->xcomp->comp_extra + PPP_HDRLEN;
new_skb = alloc_skb(new_skb_size, GFP_ATOMIC);
if (!new_skb) {
- if (net_ratelimit())
- netdev_err(ppp->dev, "PPP: no memory (comp pkt)\n");
+ net_ratelimited_function(netdev_err, ppp->dev,
+ "PPP: no memory (comp pkt)\n");
return NULL;
}
if (ppp->dev->hard_header_len > PPP_HDRLEN)
@@ -1155,8 +1155,8 @@ pad_compress_skb(struct ppp *ppp, struct sk_buff *skb)
* the compress_proto because MPPE and MPPC share
* the same number.
*/
- if (net_ratelimit())
- netdev_err(ppp->dev, "ppp: compressor dropped pkt\n");
+ net_ratelimited_function(netdev_err, ppp->dev,
+ "ppp: compressor dropped pkt\n");
kfree_skb(skb);
consume_skb(new_skb);
new_skb = NULL;
@@ -1251,8 +1251,7 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb)
if ((ppp->xstate & SC_COMP_RUN) && ppp->xc_state &&
proto != PPP_LCP && proto != PPP_CCP) {
if (!(ppp->flags & SC_CCP_UP) && (ppp->flags & SC_MUST_COMP)) {
- if (net_ratelimit())
- netdev_err(ppp->dev,
+ net_ratelimited_function(netdev_err, ppp->dev,
"ppp: compression required but "
"down - pkt dropped.\n");
goto drop;
--
1.8.2.1
^ permalink raw reply related
* [PATCH 00/18] cleanup: wrapper functions of net_ratelimit() called to simplify code
From: Kefeng Wang @ 2013-10-15 11:44 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, David S. Miller, Pablo Neira Ayuso,
Stephen Hemminger, Johannes Berg, John W. Linville,
Stanislaw Gruszka, Johannes Berg, Francois Romieu, Ben Hutchings,
Chas Williams, Marc Kleine-Budde, Samuel Ortiz, Paul Mackerras,
Oliver Neukum, Konrad Rzeszutek Wilk, Boris Ostrovsky,
David Vrabel, Rusty Russell, Michael S. Tsirkin, netfilter,
netdev, linux-wireless, guohanjun
Macro PRINTR is called only once in nfnetlink_log.c, and it can be
replaced by wrappe function of net_ratelimit(), so kill it.
Meanwhile, I found many files could use wrappe functions of net_ratelimit()
to simplify, so I did.
Kefeng Wang (18):
netfilter: cleanup: delete Macro PRINTR
net: use wrapper functions of net_ratelimit() to simplify code
rt18187se: use wrapper functions of net_ratelimit() to simplify code
rt18192e: use wrapper functions of net_ratelimit() to simplify code
rt18192u: use wrapper functions of net_ratelimit() to simplify code
net: wireless: use wrapper functions of net_ratelimit() to simplify
code
net: ethernet: use wrapper functions of net_ratelimit() to simplify
code
atm: use wrapper functions of net_ratelimit() to simplify code
block: aoe: use wrapper functions of net_ratelimit() to simplify code
net: peak_usb: use wrapper functions of net_ratelimit() to simplify
code
net: hamradio: use wrapper functions of net_ratelimit() to simplify
code
net: irda: use wrapper functions of net_ratelimit() to simplify code
net: ppp: use wrapper functions of net_ratelimit() to simplify code
net: usb: use wrapper functions of net_ratelimit() to simplify code
net: xen: use wrapper functions of net_ratelimit() to simplify code
net: virtio: use wrapper functions of net_ratelimit() to simplify code
net: vxlan: use wrapper functions of net_ratelimit() to simplify code
net: wimax: use wrapper functions of net_ratelimit() to simplify code
drivers/atm/solos-pci.c | 20 ++++-----
drivers/block/aoe/aoenet.c | 4 +-
drivers/net/can/usb/peak_usb/pcan_usb_core.c | 11 ++---
drivers/net/ethernet/aeroflex/greth.c | 16 +++----
drivers/net/ethernet/alteon/acenic.c | 3 +-
drivers/net/ethernet/arc/emac_main.c | 7 ++--
drivers/net/ethernet/broadcom/b44.c | 4 +-
drivers/net/ethernet/ethoc.c | 4 +-
drivers/net/ethernet/faraday/ftgmac100.c | 49 +++++++---------------
drivers/net/ethernet/faraday/ftmac100.c | 45 ++++++--------------
drivers/net/ethernet/freescale/fec_mpc52xx.c | 3 +-
drivers/net/ethernet/ibm/emac/mal.c | 15 ++-----
drivers/net/ethernet/marvell/mv643xx_eth.c | 6 +--
drivers/net/ethernet/marvell/pxa168_eth.c | 8 +---
drivers/net/ethernet/marvell/sky2.c | 42 +++++++------------
drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 5 +--
drivers/net/ethernet/realtek/r8169.c | 13 +++---
drivers/net/ethernet/sfc/rx.c | 8 ++--
drivers/net/ethernet/sfc/siena_sriov.c | 27 ++++--------
drivers/net/ethernet/ti/davinci_emac.c | 4 +-
drivers/net/ethernet/tundra/tsi108_eth.c | 12 ++----
drivers/net/hamradio/6pack.c | 3 +-
drivers/net/hamradio/bpqether.c | 3 +-
drivers/net/irda/stir4200.c | 3 +-
drivers/net/ppp/ppp_generic.c | 11 +++--
drivers/net/usb/usbnet.c | 4 +-
drivers/net/virtio_net.c | 3 +-
drivers/net/vxlan.c | 3 +-
drivers/net/wimax/i2400m/netdev.c | 3 +-
drivers/net/wireless/adm8211.c | 5 +--
drivers/net/wireless/ath/carl9170/cmd.c | 15 +++----
drivers/net/wireless/ath/carl9170/phy.c | 7 +---
drivers/net/wireless/ath/carl9170/rx.c | 45 ++++++--------------
drivers/net/wireless/ath/carl9170/usb.c | 12 ++----
drivers/net/wireless/hostap/hostap_80211_rx.c | 8 +---
drivers/net/wireless/hostap/hostap_80211_tx.c | 13 ++----
drivers/net/wireless/hostap/hostap_ap.c | 6 +--
drivers/net/wireless/hostap/hostap_hw.c | 17 +++-----
drivers/net/wireless/iwlegacy/3945-mac.c | 4 +-
drivers/net/wireless/iwlegacy/4965-mac.c | 6 +--
drivers/net/wireless/iwlwifi/pcie/rx.c | 7 ++--
drivers/net/wireless/libertas_tf/cmd.c | 6 +--
drivers/net/wireless/mwl8k.c | 5 +--
drivers/net/wireless/orinoco/hermes.c | 6 +--
drivers/net/wireless/orinoco/main.c | 16 +++----
drivers/net/wireless/orinoco/orinoco_usb.c | 3 +-
drivers/net/wireless/p54/p54pci.c | 6 +--
drivers/net/xen-netback/netback.c | 21 ++++------
drivers/net/xen-netfront.c | 27 ++++--------
.../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 16 ++-----
.../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 27 ++++--------
drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 4 +-
drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 7 +---
drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 13 ++----
drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 21 +++-------
drivers/staging/rtl8192e/rtllib_rx.c | 6 +--
.../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 17 ++------
.../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 22 +++-------
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 7 +---
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 4 +-
net/bridge/br_fdb.c | 6 +--
net/bridge/br_multicast.c | 13 ++----
net/bridge/br_stp_bpdu.c | 11 ++---
net/mac80211/rx.c | 6 +--
net/netfilter/ipset/ip_set_hash_gen.h | 3 +-
net/netfilter/nfnetlink_log.c | 5 +--
66 files changed, 246 insertions(+), 516 deletions(-)
--
1.8.2.1
^ permalink raw reply
* [PATCH 18/18] net: wimax: use wrapper functions of net_ratelimit() to simplify code
From: Kefeng Wang @ 2013-10-15 11:45 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, David S. Miller, Pablo Neira Ayuso,
Stephen Hemminger, Johannes Berg, John W. Linville,
Stanislaw Gruszka, Johannes Berg, Francois Romieu, Ben Hutchings,
Chas Williams, Marc Kleine-Budde, Samuel Ortiz, Paul Mackerras,
Oliver Neukum, Konrad Rzeszutek Wilk, Boris Ostrovsky,
David Vrabel, Rusty Russell, Michael S. Tsirkin, netfilter,
netdev, linux-wireless, guohanjun
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/net/wimax/i2400m/netdev.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/wimax/i2400m/netdev.c b/drivers/net/wimax/i2400m/netdev.c
index 4889613..678717a 100644
--- a/drivers/net/wimax/i2400m/netdev.c
+++ b/drivers/net/wimax/i2400m/netdev.c
@@ -305,8 +305,7 @@ int i2400m_net_wake_tx(struct i2400m *i2400m, struct net_device *net_dev,
* queue -- blame the queue disciplines that
* queue without looking -- I guess there is a reason
* for that. */
- if (net_ratelimit())
- d_printf(1, dev, "NETTX: device exiting idle, "
+ net_ratelimited_function(d_printf, 1, dev, "NETTX: device exiting idle, "
"dropping skb %p, queue running %d\n",
skb, netif_queue_stopped(net_dev));
result = -EBUSY;
--
1.8.2.1
^ permalink raw reply related
* [PATCH 09/18] block: aoe: use wrapper functions of net_ratelimit() to simplify code
From: Kefeng Wang @ 2013-10-15 11:45 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, David S. Miller, Pablo Neira Ayuso,
Stephen Hemminger, Johannes Berg, John W. Linville,
Stanislaw Gruszka, Johannes Berg, Francois Romieu, Ben Hutchings,
Chas Williams, Marc Kleine-Budde, Samuel Ortiz, Paul Mackerras,
Oliver Neukum, Konrad Rzeszutek Wilk, Boris Ostrovsky,
David Vrabel, Rusty Russell, Michael S. Tsirkin, netfilter,
netdev, linux-wireless, guohanjun
In-Reply-To: <1381837514-50660-1-git-send-email-wangkefeng.wang@huawei.com>
net_err_ratelimited() is called to simplify code.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
drivers/block/aoe/aoenet.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c
index 63773a9..25e8764 100644
--- a/drivers/block/aoe/aoenet.c
+++ b/drivers/block/aoe/aoenet.c
@@ -159,9 +159,7 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt,
n = h->err;
if (n > NECODES)
n = 0;
- if (net_ratelimit())
- printk(KERN_ERR
- "%s%d.%d@%s; ecode=%d '%s'\n",
+ net_err_ratelimited("%s%d.%d@%s; ecode=%d '%s'\n",
"aoe: error packet from ",
get_unaligned_be16(&h->major),
h->minor, skb->dev->name,
--
1.8.2.1
^ permalink raw reply related
* [PATCH 14/18] net: usb: use wrapper functions of net_ratelimit() to simplify code
From: Kefeng Wang @ 2013-10-15 11:45 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, David S. Miller, Pablo Neira Ayuso,
Stephen Hemminger, Johannes Berg, John W. Linville,
Stanislaw Gruszka, Johannes Berg, Francois Romieu, Ben Hutchings,
Chas Williams, Marc Kleine-Budde, Samuel Ortiz, Paul Mackerras,
Oliver Neukum, Konrad Rzeszutek Wilk, Boris Ostrovsky,
David Vrabel, Rusty Russell, Michael S. Tsirkin, netfilter,
netdev, linux-wireless, guohanjun
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/net/usb/usbnet.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index bf94e10..edf81de 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -450,8 +450,8 @@ void usbnet_defer_kevent (struct usbnet *dev, int work)
{
set_bit (work, &dev->flags);
if (!schedule_work (&dev->kevent)) {
- if (net_ratelimit())
- netdev_err(dev->net, "kevent %d may have been dropped\n", work);
+ net_ratelimited_function(netdev_err, dev->net,
+ "kevent %d may have been dropped\n", work);
} else {
netdev_dbg(dev->net, "kevent %d scheduled\n", work);
}
--
1.8.2.1
^ permalink raw reply related
* [PATCH 08/18] atm: use wrapper functions of net_ratelimit() to simplify code
From: Kefeng Wang @ 2013-10-15 11:45 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, David S. Miller, Pablo Neira Ayuso,
Stephen Hemminger, Johannes Berg, John W. Linville,
Stanislaw Gruszka, Johannes Berg, Francois Romieu, Ben Hutchings,
Chas Williams, Marc Kleine-Budde, Samuel Ortiz, Paul Mackerras,
Oliver Neukum, Konrad Rzeszutek Wilk, Boris Ostrovsky,
David Vrabel, Rusty Russell, Michael S. Tsirkin, netfilter,
netdev, linux-wireless, guohanjun
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
^ permalink raw reply related
* [PATCH 12/18] net: irda: use wrapper functions of net_ratelimit() to simplify code
From: Kefeng Wang @ 2013-10-15 11:45 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, David S. Miller, Pablo Neira Ayuso,
Stephen Hemminger, Johannes Berg, John W. Linville,
Stanislaw Gruszka, Johannes Berg, Francois Romieu, Ben Hutchings,
Chas Williams, Marc Kleine-Budde, Samuel Ortiz, Paul Mackerras,
Oliver Neukum, Konrad Rzeszutek Wilk, Boris Ostrovsky,
David Vrabel, Rusty Russell, Michael S. Tsirkin, netfilter,
netdev, linux-wireless, guohanjun
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/net/irda/stir4200.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
index 876e709..d499b2b 100644
--- a/drivers/net/irda/stir4200.c
+++ b/drivers/net/irda/stir4200.c
@@ -783,8 +783,7 @@ static int stir_transmit_thread(void *arg)
break;
if (unlikely(receive_start(stir))) {
- if (net_ratelimit())
- dev_info(&dev->dev,
+ net_ratelimited_function(dev_info, &dev->dev,
"%s: receive usb submit failed\n",
stir->netdev->name);
stir->receiving = 0;
--
1.8.2.1
^ permalink raw reply related
* [PATCH 11/18] net: hamradio: use wrapper functions of net_ratelimit() to simplify code
From: Kefeng Wang @ 2013-10-15 11:45 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, David S. Miller, Pablo Neira Ayuso,
Stephen Hemminger, Johannes Berg, John W. Linville,
Stanislaw Gruszka, Johannes Berg, Francois Romieu, Ben Hutchings,
Chas Williams, Marc Kleine-Budde, Samuel Ortiz, Paul Mackerras,
Oliver Neukum, Konrad Rzeszutek Wilk, Boris Ostrovsky,
David Vrabel, Rusty Russell, Michael S. Tsirkin, netfilter,
netdev, linux-wireless, guohanjun
In-Reply-To: <1381837514-50660-1-git-send-email-wangkefeng.wang@huawei.com>
net_XXX_ratelimited() is called to simplify code.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
drivers/net/hamradio/6pack.c | 3 +--
drivers/net/hamradio/bpqether.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 1450e33..9e97eba 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -237,8 +237,7 @@ static void sp_encaps(struct sixpack *sp, unsigned char *icp, int len)
out_drop:
sp->dev->stats.tx_dropped++;
netif_start_queue(sp->dev);
- if (net_ratelimit())
- printk(KERN_DEBUG "%s: %s - dropped.\n", sp->dev->name, msg);
+ net_dbg_ratelimited("%s: %s - dropped.\n", sp->dev->name, msg);
}
/* Encapsulate an IP datagram and kick it into a TTY queue. */
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index f91bf0d..1522b4a 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -269,8 +269,7 @@ static netdev_tx_t bpq_xmit(struct sk_buff *skb, struct net_device *dev)
* space for the BPQ headers.
*/
if (skb_cow(skb, AX25_BPQ_HEADER_LEN)) {
- if (net_ratelimit())
- pr_err("bpqether: out of memory\n");
+ net_err_ratelimited("pqether: out of memory\n");
kfree_skb(skb);
return NETDEV_TX_OK;
--
1.8.2.1
^ permalink raw reply related
* [PATCH 01/18] netfilter: cleanup: delete Macro PRINTR
From: Kefeng Wang @ 2013-10-15 11:44 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, David S. Miller, Pablo Neira Ayuso,
Stephen Hemminger, Johannes Berg, John W. Linville,
Stanislaw Gruszka, Johannes Berg, Francois Romieu, Ben Hutchings,
Chas Williams, Marc Kleine-Budde, Samuel Ortiz, Paul Mackerras,
Oliver Neukum, Konrad Rzeszutek Wilk, Boris Ostrovsky,
David Vrabel, Rusty Russell, Michael S. Tsirkin, netfilter,
netdev, linux-wireless, guohanjun
In-Reply-To: <1381837514-50660-1-git-send-email-wangkefeng.wang@huawei.com>
Macro PRINTR is only used once in nfnetlink_log.c, so it can be
replaced by helper function net_err_ratelimited().
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
net/netfilter/nfnetlink_log.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index d92cc31..8713111 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -47,9 +47,6 @@
#define NFULNL_QTHRESH_DEFAULT 100 /* 100 packets */
#define NFULNL_COPY_RANGE_MAX 0xFFFF /* max packet size is limited by 16-bit struct nfattr nfa_len field */
-#define PRINTR(x, args...) do { if (net_ratelimit()) \
- printk(x, ## args); } while (0);
-
struct nfulnl_instance {
struct hlist_node hlist; /* global list of instances */
spinlock_t lock;
@@ -587,7 +584,7 @@ __build_packet_message(struct nfnl_log_net *log,
return 0;
nla_put_failure:
- PRINTR(KERN_ERR "nfnetlink_log: error creating log nlmsg\n");
+ net_err_ratelimited("nfnetlink_log: error creating log nlmsg\n");
return -1;
}
--
1.8.2.1
^ permalink raw reply related
* [PATCH 02/18] net: use wrapper functions of net_ratelimit() to simplify code
From: Kefeng Wang @ 2013-10-15 11:44 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, David S. Miller, Pablo Neira Ayuso,
Stephen Hemminger, Johannes Berg, John W. Linville,
Stanislaw Gruszka, Johannes Berg, Francois Romieu, Ben Hutchings,
Chas Williams, Marc Kleine-Budde, Samuel Ortiz, Paul Mackerras,
Oliver Neukum, Konrad Rzeszutek Wilk, Boris Ostrovsky,
David Vrabel, Rusty Russell, Michael S. Tsirkin, netfilter,
netdev, linux-wireless, guohanjun
In-Reply-To: <1381837514-50660-1-git-send-email-wangkefeng.wang@huawei.com>
Wrapper functions net_ratelimited_function() and net_XXX_ratelimited()
are called to simplify code.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
net/bridge/br_fdb.c | 6 ++----
net/bridge/br_multicast.c | 13 ++++---------
net/bridge/br_stp_bpdu.c | 11 ++++-------
net/mac80211/rx.c | 6 ++----
net/netfilter/ipset/ip_set_hash_gen.h | 3 +--
5 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index ffd5874..e47dfe5 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -465,10 +465,8 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
if (likely(fdb)) {
/* attempt to update an entry for a local interface */
if (unlikely(fdb->is_local)) {
- if (net_ratelimit())
- br_warn(br, "received packet on %s with "
- "own address as source address\n",
- source->dev->name);
+ net_ratelimited_function(br_warn, br, "received packet on %s "
+ "with own address as source address\n", source->dev->name);
} else {
/* fastpath: update of existing entry */
fdb->dst = source;
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index d1c5786..c00d8a2 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -530,11 +530,8 @@ static struct net_bridge_mdb_entry *br_multicast_get_group(
max = mdb->max;
if (unlikely(count > br->hash_elasticity && count)) {
- if (net_ratelimit())
- br_info(br, "Multicast hash table "
- "chain limit reached: %s\n",
- port ? port->dev->name : br->dev->name);
-
+ net_ratelimited_function(br_info, br, "Multicast hash table "
+ "chain limit reached: %s\n", port ? port->dev->name : br->dev->name);
elasticity = br->hash_elasticity;
}
@@ -554,10 +551,8 @@ disable:
if (max > mdb->max || elasticity) {
if (mdb->old) {
- if (net_ratelimit())
- br_info(br, "Multicast hash table "
- "on fire: %s\n",
- port ? port->dev->name : br->dev->name);
+ net_ratelimited_function(br_info, br, "Multicast hash table "
+ "on fire: %s\n", port ? port->dev->name : br->dev->name);
err = -EEXIST;
goto err;
}
diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c
index 8660ea3..482ef11 100644
--- a/net/bridge/br_stp_bpdu.c
+++ b/net/bridge/br_stp_bpdu.c
@@ -220,13 +220,10 @@ void br_stp_rcv(const struct stp_proto *proto, struct sk_buff *skb,
bpdu.forward_delay = br_get_ticks(buf+30);
if (bpdu.message_age > bpdu.max_age) {
- if (net_ratelimit())
- br_notice(p->br,
- "port %u config from %pM"
- " (message_age %ul > max_age %ul)\n",
- p->port_no,
- eth_hdr(skb)->h_source,
- bpdu.message_age, bpdu.max_age);
+ net_ratelimited_function(br_notice, p->br,
+ "port %u config from %pM (message_age %ul > max_age %ul)\n",
+ p->port_no, eth_hdr(skb)->h_source,
+ bpdu.message_age, bpdu.max_age);
goto out;
}
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 54395d7..35b8b1d 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -3156,10 +3156,8 @@ static bool ieee80211_prepare_and_rx_handle(struct ieee80211_rx_data *rx,
if (!consume) {
skb = skb_copy(skb, GFP_ATOMIC);
if (!skb) {
- if (net_ratelimit())
- wiphy_debug(local->hw.wiphy,
- "failed to copy skb for %s\n",
- sdata->name);
+ net_ratelimited_function(wiphy_debug, local->hw.wiphy,
+ "failed to copy skb for %s\n", sdata->name);
return true;
}
diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h
index 707bc52..6179436 100644
--- a/net/netfilter/ipset/ip_set_hash_gen.h
+++ b/net/netfilter/ipset/ip_set_hash_gen.h
@@ -607,8 +607,7 @@ mtype_add(struct ip_set *set, void *value, const struct ip_set_ext *ext,
mtype_expire(h, NETS_LENGTH(set->family), h->dsize);
if (h->elements >= h->maxelem) {
- if (net_ratelimit())
- pr_warning("Set %s is full, maxelem %u reached\n",
+ net_warn_ratelimited("Set %s is full, maxelem %u reached\n",
set->name, h->maxelem);
return -IPSET_ERR_HASH_FULL;
}
--
1.8.2.1
^ permalink raw reply related
* [PATCH 05/18] rt18192u: use wrapper functions of net_ratelimit() to simplify code
From: Kefeng Wang @ 2013-10-15 11:45 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, David S. Miller, Pablo Neira Ayuso,
Stephen Hemminger, Johannes Berg, John W. Linville,
Stanislaw Gruszka, Johannes Berg, Francois Romieu, Ben Hutchings,
Chas Williams, Marc Kleine-Budde, Samuel Ortiz, Paul Mackerras,
Oliver Neukum, Konrad Rzeszutek Wilk, Boris Ostrovsky,
David Vrabel, Rusty Russell, Michael S. Tsirkin, netfilter,
netdev, linux-wireless, guohanjun
In-Reply-To: <1381837514-50660-1-git-send-email-wangkefeng.wang@huawei.com>
net_XXX_ratelimited() is called to simplify code.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
.../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 17 ++++-------------
.../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 22 +++++-----------------
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 7 ++-----
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 4 +---
4 files changed, 12 insertions(+), 38 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c
index f2b1677..534f0a4 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c
@@ -284,10 +284,8 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
pos = skb->data + hdr_len;
keyidx = pos[3];
if (!(keyidx & (1 << 5))) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG "CCMP: received packet without ExtIV"
+ net_dbg_ratelimited("CCMP: received packet without ExtIV"
" flag from %pM\n", hdr->addr2);
- }
key->dot11RSNAStatsCCMPFormatErrors++;
return -2;
}
@@ -298,11 +296,9 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
return -6;
}
if (!key->key_set) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG "CCMP: received packet from %pM"
+ net_dbg_ratelimited("CCMP: received packet from %pM"
" with keyid=%d that does not have a configured"
" key\n", hdr->addr2, keyidx);
- }
return -3;
}
@@ -315,11 +311,9 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
pos += 8;
if (memcmp(pn, key->rx_pn, CCMP_PN_LEN) <= 0) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG "CCMP: replay detected: STA=%pM"
+ net_dbg_ratelimited("CCMP: replay detected: STA=%pM"
" previous PN %pm received PN %pm\n",
hdr->addr2, key->rx_pn, pn);
- }
key->dot11RSNAStatsCCMPReplays++;
return -4;
}
@@ -353,10 +347,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
}
if (memcmp(mic, a, CCMP_MIC_LEN) != 0) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG "CCMP: decrypt failed: STA="
- "%pM\n", hdr->addr2);
- }
+ net_dbg_ratelimited("CCMP: decrypt failed: STA=%pM\n", hdr->addr2);
key->dot11RSNAStatsCCMPDecryptErrors++;
return -5;
}
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
index 93121b4..7bb5a96 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
@@ -406,10 +406,8 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
pos = skb->data + hdr_len;
keyidx = pos[3];
if (!(keyidx & (1 << 5))) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG "TKIP: received packet without ExtIV"
+ net_dbg_ratelimited("TKIP: received packet without ExtIV"
" flag from %pM\n", hdr->addr2);
- }
return -2;
}
keyidx >>= 6;
@@ -419,11 +417,9 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
return -6;
}
if (!tkey->key_set) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG "TKIP: received packet from %pM"
+ net_dbg_ratelimited("TKIP: received packet from %pM"
" with keyid=%d that does not have a configured"
" key\n", hdr->addr2, keyidx);
- }
return -3;
}
iv16 = (pos[0] << 8) | pos[2];
@@ -434,12 +430,10 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
{
if (iv32 < tkey->rx_iv32 ||
(iv32 == tkey->rx_iv32 && iv16 <= tkey->rx_iv16)) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG "TKIP: replay detected: STA=%pM"
+ net_dbg_ratelimited("TKIP: replay detected: STA=%pM"
" previous TSC %08x%04x received TSC "
"%08x%04x\n", hdr->addr2,
tkey->rx_iv32, tkey->rx_iv16, iv32, iv16);
- }
tkey->dot11RSNAStatsTKIPReplays++;
return -4;
}
@@ -456,11 +450,8 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
sg_init_one(&sg, pos, plen+4);
if (crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4)) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG ": TKIP: failed to decrypt "
- "received packet from %pM\n",
+ net_dbg_ratelimited("TKIP: failed to decrypt received packet from %pM\n",
hdr->addr2);
- }
return -7;
}
@@ -476,10 +467,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
* it needs to be recalculated for the next packet. */
tkey->rx_phase1_done = 0;
}
- if (net_ratelimit()) {
- printk(KERN_DEBUG "TKIP: ICV error detected: STA="
- "%pM\n", hdr->addr2);
- }
+ net_dbg_ratelimited("TKIP: ICV error detected: STA=%pM\n", hdr->addr2);
tkey->dot11RSNAStatsTKIPICVErrors++;
return -5;
}
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
index 59900bf..5e6c1eb 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
@@ -355,11 +355,9 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb,
#ifdef CONFIG_IEEE80211_CRYPT_TKIP
if (ieee->tkip_countermeasures &&
strcmp(crypt->ops->name, "TKIP") == 0) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
+ net_dbg_ratelimited("%s: TKIP countermeasures: dropped "
"received packet from %pM\n",
ieee->dev->name, hdr->addr2);
- }
return -1;
}
#endif
@@ -946,8 +944,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
if(HTCCheck(ieee, skb->data))
{
- if(net_ratelimit())
- printk("find HTCControl\n");
+ net_info_ratelimited("find HTCControl\n");
hdrlen += 4;
rx_stats->bContainHTC = 1;
}
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
index a7bcc64f..55c24d7 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
@@ -197,11 +197,9 @@ int ieee80211_encrypt_fragment(
if (ieee->tkip_countermeasures &&
crypt && crypt->ops && strcmp(crypt->ops->name, "TKIP") == 0) {
header = (struct ieee80211_hdr *) frag->data;
- if (net_ratelimit()) {
- printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
+ net_dbg_ratelimited("%s: TKIP countermeasures: dropped "
"TX packet to %pM\n",
ieee->dev->name, header->addr1);
- }
return -1;
}
#endif
--
1.8.2.1
^ permalink raw reply related
* [PATCH 04/18] rt18192e: use wrapper functions of net_ratelimit() to simplify code
From: Kefeng Wang @ 2013-10-15 11:45 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, David S. Miller, Pablo Neira Ayuso,
Stephen Hemminger, Johannes Berg, John W. Linville,
Stanislaw Gruszka, Johannes Berg, Francois Romieu, Ben Hutchings,
Chas Williams, Marc Kleine-Budde, Samuel Ortiz, Paul Mackerras,
Oliver Neukum, Konrad Rzeszutek Wilk, Boris Ostrovsky,
David Vrabel, Rusty Russell, Michael S. Tsirkin, netfilter,
netdev, linux-wireless, guohanjun
In-Reply-To: <1381837514-50660-1-git-send-email-wangkefeng.wang@huawei.com>
Wrapper functions net_ratelimited_function() and net_XXX_ratelimited()
are called to simplify code.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 13 +++----------
drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 21 +++++----------------
drivers/staging/rtl8192e/rtllib_rx.c | 6 ++----
3 files changed, 10 insertions(+), 30 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c b/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
index e51cb49..0d089c1 100644
--- a/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
+++ b/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
@@ -275,10 +275,8 @@ static int rtllib_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
pos = skb->data + hdr_len;
keyidx = pos[3];
if (!(keyidx & (1 << 5))) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG "CCMP: received packet without ExtIV"
+ net_dbg_ratelimited("CCMP: received packet without ExtIV"
" flag from %pM\n", hdr->addr2);
- }
key->dot11RSNAStatsCCMPFormatErrors++;
return -2;
}
@@ -289,11 +287,9 @@ static int rtllib_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
return -6;
}
if (!key->key_set) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG "CCMP: received packet from %pM"
+ net_dbg_ratelimited("CCMP: received packet from %pM"
" with keyid=%d that does not have a configured"
" key\n", hdr->addr2, keyidx);
- }
return -3;
}
@@ -338,10 +334,7 @@ static int rtllib_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
}
if (memcmp(mic, a, CCMP_MIC_LEN) != 0) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG "CCMP: decrypt failed: STA="
- " %pM\n", hdr->addr2);
- }
+ net_dbg_ratelimited("CCMP: decrypt failed: STA= %pM\n", hdr->addr2);
key->dot11RSNAStatsCCMPDecryptErrors++;
return -5;
}
diff --git a/drivers/staging/rtl8192e/rtllib_crypt_tkip.c b/drivers/staging/rtl8192e/rtllib_crypt_tkip.c
index 5cfd73b..c1f7683 100644
--- a/drivers/staging/rtl8192e/rtllib_crypt_tkip.c
+++ b/drivers/staging/rtl8192e/rtllib_crypt_tkip.c
@@ -396,10 +396,8 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
pos = skb->data + hdr_len;
keyidx = pos[3];
if (!(keyidx & (1 << 5))) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG "TKIP: received packet without ExtIV"
+ net_dbg_ratelimited("TKIP: received packet without ExtIV"
" flag from %pM\n", hdr->addr2);
- }
return -2;
}
keyidx >>= 6;
@@ -409,11 +407,9 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
return -6;
}
if (!tkey->key_set) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG "TKIP: received packet from %pM"
+ net_dbg_ratelimited("TKIP: received packet from %pM"
" with keyid=%d that does not have a configured"
" key\n", hdr->addr2, keyidx);
- }
return -3;
}
iv16 = (pos[0] << 8) | pos[2];
@@ -424,12 +420,10 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
if ((iv32 < tkey->rx_iv32 ||
(iv32 == tkey->rx_iv32 && iv16 <= tkey->rx_iv16)) &&
tkey->initialized) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG "TKIP: replay detected: STA="
+ net_dbg_ratelimited("TKIP: replay detected: STA="
" %pM previous TSC %08x%04x received "
"TSC %08x%04x\n",hdr->addr2,
tkey->rx_iv32, tkey->rx_iv16, iv32, iv16);
- }
tkey->dot11RSNAStatsTKIPReplays++;
return -4;
}
@@ -448,11 +442,9 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
crypto_blkcipher_setkey(tkey->rx_tfm_arc4, rc4key, 16);
if (crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4)) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG ": TKIP: failed to decrypt "
+ net_dbg_ratelimited(": TKIP: failed to decrypt "
"received packet from %pM\n",
hdr->addr2);
- }
return -7;
}
@@ -469,10 +461,7 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
* next packet. */
tkey->rx_phase1_done = 0;
}
- if (net_ratelimit()) {
- printk(KERN_DEBUG "TKIP: ICV error detected: STA="
- " %pM\n", hdr->addr2);
- }
+ net_dbg_ratelimited("TKIP: ICV error detected: STA= %pM\n", hdr->addr2);
tkey->dot11RSNAStatsTKIPICVErrors++;
return -5;
}
diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index 8aeaed5..4335611 100644
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -870,8 +870,7 @@ static size_t rtllib_rx_get_hdrlen(struct rtllib_device *ieee,
hdrlen = rtllib_get_hdrlen(fc);
if (HTCCheck(ieee, skb->data)) {
- if (net_ratelimit())
- printk(KERN_INFO "%s: find HTCControl!\n", __func__);
+ net_info_ratelimited("%s: find HTCControl!\n", __func__);
hdrlen += 4;
rx_stats->bContainHTC = 1;
}
@@ -1439,8 +1438,7 @@ static int rtllib_rx_Monitor(struct rtllib_device *ieee, struct sk_buff *skb,
}
if (HTCCheck(ieee, skb->data)) {
- if (net_ratelimit())
- printk(KERN_INFO "%s: Find HTCControl!\n", __func__);
+ net_info_ratelimited("%s: Find HTCControl!\n", __func__);
hdrlen += 4;
}
--
1.8.2.1
^ permalink raw reply related
* [PATCH 06/18] net: wireless: use wrapper functions of net_ratelimit() to simplify code
From: Kefeng Wang @ 2013-10-15 11:45 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, David S. Miller, Pablo Neira Ayuso,
Stephen Hemminger, Johannes Berg, John W. Linville,
Stanislaw Gruszka, Johannes Berg, Francois Romieu, Ben Hutchings,
Chas Williams, Marc Kleine-Budde, Samuel Ortiz, Paul Mackerras,
Oliver Neukum, Konrad Rzeszutek Wilk, Boris Ostrovsky,
David Vrabel, Rusty Russell, Michael S. Tsirkin, netfilter,
netdev, linux-wireless, guohanjun
In-Reply-To: <1381837514-50660-1-git-send-email-wangkefeng.wang@huawei.com>
Wrapper functions net_ratelimited_function() and net_XXX_ratelimited()
are called to simplify code.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
drivers/net/wireless/adm8211.c | 5 ++-
drivers/net/wireless/ath/carl9170/cmd.c | 15 +++------
drivers/net/wireless/ath/carl9170/phy.c | 7 ++---
drivers/net/wireless/ath/carl9170/rx.c | 45 ++++++++-------------------
drivers/net/wireless/ath/carl9170/usb.c | 12 +++----
drivers/net/wireless/hostap/hostap_80211_rx.c | 8 ++---
drivers/net/wireless/hostap/hostap_80211_tx.c | 13 +++-----
drivers/net/wireless/hostap/hostap_ap.c | 6 ++--
drivers/net/wireless/hostap/hostap_hw.c | 17 +++-------
drivers/net/wireless/iwlegacy/3945-mac.c | 4 +--
drivers/net/wireless/iwlegacy/4965-mac.c | 6 ++--
drivers/net/wireless/iwlwifi/pcie/rx.c | 7 ++---
drivers/net/wireless/libertas_tf/cmd.c | 6 ++--
drivers/net/wireless/mwl8k.c | 5 ++-
drivers/net/wireless/orinoco/hermes.c | 6 ++--
drivers/net/wireless/orinoco/main.c | 16 +++-------
drivers/net/wireless/orinoco/orinoco_usb.c | 3 +-
drivers/net/wireless/p54/p54pci.c | 6 ++--
18 files changed, 61 insertions(+), 126 deletions(-)
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index f9a24e5..2fafb8a 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -374,9 +374,8 @@ static void adm8211_interrupt_rci(struct ieee80211_hw *dev)
pktlen = status & RDES0_STATUS_FL;
if (pktlen > RX_PKT_SIZE) {
- if (net_ratelimit())
- wiphy_debug(dev->wiphy, "frame too long (%d)\n",
- pktlen);
+ net_ratelimited_function(wiphy_debug, dev->wiphy,
+ "frame too long (%d)\n", pktlen);
pktlen = RX_PKT_SIZE;
}
diff --git a/drivers/net/wireless/ath/carl9170/cmd.c b/drivers/net/wireless/ath/carl9170/cmd.c
index 39a6387..3f13398 100644
--- a/drivers/net/wireless/ath/carl9170/cmd.c
+++ b/drivers/net/wireless/ath/carl9170/cmd.c
@@ -50,12 +50,9 @@ int carl9170_write_reg(struct ar9170 *ar, const u32 reg, const u32 val)
err = carl9170_exec_cmd(ar, CARL9170_CMD_WREG, sizeof(buf),
(u8 *) buf, 0, NULL);
- if (err) {
- if (net_ratelimit()) {
- wiphy_err(ar->hw->wiphy, "writing reg %#x "
- "(val %#x) failed (%d)\n", reg, val, err);
- }
- }
+ if (err)
+ net_ratelimited_function(wiphy_err, ar->hw->wiphy,
+ "writing reg %#x (val %#x) failed (%d)\n", reg, val, err);
return err;
}
@@ -77,10 +74,8 @@ int carl9170_read_mreg(struct ar9170 *ar, const int nregs,
4 * nregs, (u8 *)offs,
4 * nregs, (u8 *)res);
if (err) {
- if (net_ratelimit()) {
- wiphy_err(ar->hw->wiphy, "reading regs failed (%d)\n",
- err);
- }
+ net_ratelimited_function(wiphy_err, ar->hw->wiphy,
+ "reading regs failed (%d)\n", err);
return err;
}
diff --git a/drivers/net/wireless/ath/carl9170/phy.c b/drivers/net/wireless/ath/carl9170/phy.c
index ab4ee7d..cae9125 100644
--- a/drivers/net/wireless/ath/carl9170/phy.c
+++ b/drivers/net/wireless/ath/carl9170/phy.c
@@ -1715,11 +1715,8 @@ int carl9170_set_channel(struct ar9170 *ar, struct ieee80211_channel *channel,
err = carl9170_write_reg(ar, AR9170_PHY_REG_HEAVY_CLIP_ENABLE,
0x200 | ar->heavy_clip);
if (err) {
- if (net_ratelimit()) {
- wiphy_err(ar->hw->wiphy, "failed to set "
- "heavy clip\n");
- }
-
+ net_ratelimited_function(wiphy_err,
+ ar->hw->wiphy, "failed to set heavy clip\n");
return err;
}
}
diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c
index e935f61..0ad905e 100644
--- a/drivers/net/wireless/ath/carl9170/rx.c
+++ b/drivers/net/wireless/ath/carl9170/rx.c
@@ -343,9 +343,8 @@ static int carl9170_rx_mac_status(struct ar9170 *ar,
if (unlikely(error)) {
/* TODO: update netdevice's RX dropped/errors statistics */
- if (net_ratelimit())
- wiphy_dbg(ar->hw->wiphy, "received frame with "
- "suspicious error code (%#x).\n", error);
+ net_ratelimited_function(wiphy_dbg, ar->hw->wiphy,
+ "received frame with suspicious error code (%#x).\n", error);
return -EINVAL;
}
@@ -374,11 +373,8 @@ static int carl9170_rx_mac_status(struct ar9170 *ar,
status->rate_idx = 3;
break;
default:
- if (net_ratelimit()) {
- wiphy_err(ar->hw->wiphy, "invalid plcp cck "
- "rate (%x).\n", head->plcp[0]);
- }
-
+ net_ratelimited_function(wiphy_err, ar->hw->wiphy,
+ "invalid plcp cck rate (%x).\n", head->plcp[0]);
return -EINVAL;
}
break;
@@ -411,11 +407,8 @@ static int carl9170_rx_mac_status(struct ar9170 *ar,
status->rate_idx = 7;
break;
default:
- if (net_ratelimit()) {
- wiphy_err(ar->hw->wiphy, "invalid plcp ofdm "
- "rate (%x).\n", head->plcp[0]);
- }
-
+ net_ratelimited_function(wiphy_err, ar->hw->wiphy,
+ "invalid plcp ofdm rate (%x).\n", head->plcp[0]);
return -EINVAL;
}
if (status->band == IEEE80211_BAND_2GHZ)
@@ -742,11 +735,8 @@ static void carl9170_rx_untie_data(struct ar9170 *ar, u8 *buf, int len)
ar->rx_has_plcp = true;
} else {
- if (net_ratelimit()) {
- wiphy_err(ar->hw->wiphy, "plcp info "
- "is clipped.\n");
- }
-
+ net_ratelimited_function(wiphy_err, ar->hw->wiphy,
+ "plcp info is clipped.\n");
goto drop;
}
break;
@@ -763,11 +753,8 @@ static void carl9170_rx_untie_data(struct ar9170 *ar, u8 *buf, int len)
mpdu_len -= sizeof(struct ar9170_rx_phystatus);
phy = (void *)(buf + mpdu_len);
} else {
- if (net_ratelimit()) {
- wiphy_err(ar->hw->wiphy, "frame tail "
- "is clipped.\n");
- }
-
+ net_ratelimited_function(wiphy_err, ar->hw->wiphy,
+ "frame tail is clipped.\n");
goto drop;
}
@@ -900,11 +887,8 @@ static void carl9170_rx_stream(struct ar9170 *ar, void *buf, unsigned int len)
if (!ar->rx_failover_missing) {
/* this is not "short read". */
- if (net_ratelimit()) {
- wiphy_err(ar->hw->wiphy,
+ net_ratelimited_function(wiphy_err, ar->hw->wiphy,
"missing tag!\n");
- }
-
__carl9170_rx(ar, tbuf, tlen);
return;
}
@@ -973,11 +957,8 @@ static void carl9170_rx_stream(struct ar9170 *ar, void *buf, unsigned int len)
}
if (tlen) {
- if (net_ratelimit()) {
- wiphy_err(ar->hw->wiphy, "%d bytes of unprocessed "
- "data left in rx stream!\n", tlen);
- }
-
+ net_ratelimited_function(wiphy_err, ar->hw->wiphy,
+ "%d bytes of unprocessed data left in rx stream!\n", tlen);
goto err_telluser;
}
diff --git a/drivers/net/wireless/ath/carl9170/usb.c b/drivers/net/wireless/ath/carl9170/usb.c
index 307bc0d..0369f0f 100644
--- a/drivers/net/wireless/ath/carl9170/usb.c
+++ b/drivers/net/wireless/ath/carl9170/usb.c
@@ -144,10 +144,8 @@ static void carl9170_usb_submit_data_urb(struct ar9170 *ar)
err = usb_submit_urb(urb, GFP_ATOMIC);
if (unlikely(err)) {
- if (net_ratelimit()) {
- dev_err(&ar->udev->dev, "tx submit failed (%d)\n",
- urb->status);
- }
+ net_ratelimited_function(dev_err, &ar->udev->dev,
+ "tx submit failed (%d)\n", urb->status);
usb_unanchor_urb(urb);
usb_anchor_urb(urb, &ar->tx_err);
@@ -194,10 +192,8 @@ static void carl9170_usb_tx_data_complete(struct urb *urb)
/* a random transmission error has occurred? */
default:
- if (net_ratelimit()) {
- dev_err(&ar->udev->dev, "tx failed (%d)\n",
- urb->status);
- }
+ net_ratelimited_function(dev_err, &ar->udev->dev,
+ "tx failed (%d)\n", urb->status);
usb_anchor_urb(urb, &ar->tx_err);
break;
diff --git a/drivers/net/wireless/hostap/hostap_80211_rx.c b/drivers/net/wireless/hostap/hostap_80211_rx.c
index d39e3e2..a547d79 100644
--- a/drivers/net/wireless/hostap/hostap_80211_rx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_rx.c
@@ -661,11 +661,9 @@ hostap_rx_frame_decrypt(local_info_t *local, struct sk_buff *skb,
if (local->tkip_countermeasures &&
strcmp(crypt->ops->name, "TKIP") == 0) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
+ net_dbg_ratelimited("%s: TKIP countermeasures: dropped "
"received packet from %pM\n",
local->dev->name, hdr->addr2);
- }
return -1;
}
@@ -995,11 +993,9 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
if (local->drop_unencrypted && !(fc & IEEE80211_FCTL_PROTECTED) &&
!hostap_is_eapol_frame(local, skb)) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG "%s: dropped unencrypted RX data "
+ net_dbg_ratelimited("%s: dropped unencrypted RX data "
"frame from %pM (drop_unencrypted=1)\n",
dev->name, hdr->addr2);
- }
goto rx_dropped;
}
diff --git a/drivers/net/wireless/hostap/hostap_80211_tx.c b/drivers/net/wireless/hostap/hostap_80211_tx.c
index 344a981..7c8f798 100644
--- a/drivers/net/wireless/hostap/hostap_80211_tx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_tx.c
@@ -330,11 +330,8 @@ static struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
if (local->tkip_countermeasures &&
strcmp(crypt->ops->name, "TKIP") == 0) {
hdr = (struct ieee80211_hdr *) skb->data;
- if (net_ratelimit()) {
- printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
- "TX packet to %pM\n",
- local->dev->name, hdr->addr1);
- }
+ net_dbg_ratelimited("%s: TKIP countermeasures: dropped "
+ "TX packet to %pM\n", local->dev->name, hdr->addr1);
kfree_skb(skb);
return NULL;
}
@@ -502,10 +499,8 @@ netdev_tx_t hostap_master_start_xmit(struct sk_buff *skb,
} else if (local->drop_unencrypted &&
ieee80211_is_data(hdr->frame_control) &&
meta->ethertype != ETH_P_PAE) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG "%s: dropped unencrypted TX data "
- "frame (drop_unencrypted=1)\n", dev->name);
- }
+ net_dbg_ratelimited("%s: dropped unencrypted TX data "
+ "frame (drop_unencrypted=1)\n", dev->name);
iface->stats.tx_dropped++;
ret = NETDEV_TX_OK;
goto fail;
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index d6033a8..9320dc7 100644
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -2781,10 +2781,8 @@ ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx)
* for a unicast frame. In this case, the packet is send to all
* ports of the bridge. Since this is a valid scenario, do not
* print out any errors here. */
- if (net_ratelimit()) {
- printk(KERN_DEBUG "AP: drop packet to non-associated "
- "STA %pM\n", hdr->addr1);
- }
+ net_dbg_ratelimited("AP: drop packet to non-associatedSTA %pM\n",
+ hdr->addr1);
#endif
local->ap->tx_drop_nonassoc++;
ret = AP_TX_DROP;
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index c275dc1..34b7246 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -1820,10 +1820,8 @@ static int prism2_tx_80211(struct sk_buff *skb, struct net_device *dev)
if ((local->func->card_present && !local->func->card_present(local)) ||
!local->hw_ready || local->hw_downloading || local->pri_only) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG "%s: prism2_tx_80211: hw not ready -"
- " skipping\n", dev->name);
- }
+ net_dbg_ratelimited("%s: prism2_tx_80211: hw not ready skipping\n",
+ dev->name);
goto fail;
}
@@ -2620,10 +2618,8 @@ static irqreturn_t prism2_interrupt(int irq, void *dev_id)
/* Detect early interrupt before driver is fully configured */
spin_lock(&local->irq_init_lock);
if (!dev->base_addr) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG "%s: Interrupt, but dev not configured\n",
- dev->name);
- }
+ net_dbg_ratelimited("%s: Interrupt, but dev not configured\n",
+ dev->name);
spin_unlock(&local->irq_init_lock);
return IRQ_HANDLED;
}
@@ -2632,10 +2628,7 @@ static irqreturn_t prism2_interrupt(int irq, void *dev_id)
prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INTERRUPT, 0, 0);
if (local->func->card_present && !local->func->card_present(local)) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG "%s: Interrupt, but dev not OK\n",
- dev->name);
- }
+ net_dbg_ratelimited("%s: Interrupt, but dev not OK\n", dev->name);
return IRQ_HANDLED;
}
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
index 9581d07..920c0b8 100644
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -1027,8 +1027,8 @@ il3945_rx_allocate(struct il_priv *il, gfp_t priority)
/* Alloc a new receive buffer */
page = alloc_pages(gfp_mask, il->hw_params.rx_page_order);
if (!page) {
- if (net_ratelimit())
- D_INFO("Failed to allocate SKB buffer.\n");
+ net_ratelimited_function(D_INFO,
+ "Failed to allocate SKB buffer.\n");
if (rxq->free_count <= RX_LOW_WATERMARK &&
net_ratelimit())
IL_ERR("Failed to allocate SKB buffer with %0x."
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index 5ab50a5..4f8de71 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -340,9 +340,9 @@ il4965_rx_allocate(struct il_priv *il, gfp_t priority)
/* Alloc a new receive buffer */
page = alloc_pages(gfp_mask, il->hw_params.rx_page_order);
if (!page) {
- if (net_ratelimit())
- D_INFO("alloc_pages failed, " "order: %d\n",
- il->hw_params.rx_page_order);
+ net_ratelimited_function(D_INFO,
+ "alloc_pages failed, order: %d\n",
+ il->hw_params.rx_page_order);
if (rxq->free_count <= RX_LOW_WATERMARK &&
net_ratelimit())
diff --git a/drivers/net/wireless/iwlwifi/pcie/rx.c b/drivers/net/wireless/iwlwifi/pcie/rx.c
index 3f237b4..022f612 100644
--- a/drivers/net/wireless/iwlwifi/pcie/rx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/rx.c
@@ -293,10 +293,9 @@ static void iwl_pcie_rxq_alloc_rbs(struct iwl_trans *trans, gfp_t priority)
/* Alloc a new receive buffer */
page = alloc_pages(gfp_mask, trans_pcie->rx_page_order);
if (!page) {
- if (net_ratelimit())
- IWL_DEBUG_INFO(trans, "alloc_pages failed, "
- "order: %d\n",
- trans_pcie->rx_page_order);
+ net_ratelimited_function(IWL_DEBUG_INFO, trans,
+ "alloc_pages failed, order: %d\n",
+ trans_pcie->rx_page_order);
if ((rxq->free_count <= RX_LOW_WATERMARK) &&
net_ratelimit())
diff --git a/drivers/net/wireless/libertas_tf/cmd.c b/drivers/net/wireless/libertas_tf/cmd.c
index 909ac36..806f750 100644
--- a/drivers/net/wireless/libertas_tf/cmd.c
+++ b/drivers/net/wireless/libertas_tf/cmd.c
@@ -737,10 +737,8 @@ int lbtf_process_rx_command(struct lbtf_private *priv)
respcmd = le16_to_cpu(resp->command);
result = le16_to_cpu(resp->result);
- if (net_ratelimit())
- pr_info("libertastf: cmd response 0x%04x, seq %d, size %d\n",
- respcmd, le16_to_cpu(resp->seqnum),
- le16_to_cpu(resp->size));
+ net_info_ratelimited("libertastf: cmd response 0x%04x, seq %d, size %d\n",
+ respcmd, le16_to_cpu(resp->seqnum), le16_to_cpu(resp->size));
if (resp->seqnum != priv->cur_cmd->cmdbuf->seqnum) {
spin_unlock_irqrestore(&priv->driver_lock, flags);
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index a3707fd..fe19424 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -5060,9 +5060,8 @@ mwl8k_configure_filter_sniffer(struct ieee80211_hw *hw,
* interface is active.
*/
if (!list_empty(&priv->vif_list)) {
- if (net_ratelimit())
- wiphy_info(hw->wiphy,
- "not enabling sniffer mode because STA interface is active\n");
+ net_ratelimited_function(wiphy_info, hw->wiphy,
+ "not enabling sniffer mode because STA interface is active\n");
return 0;
}
diff --git a/drivers/net/wireless/orinoco/hermes.c b/drivers/net/wireless/orinoco/hermes.c
index 75c15bc..e4ff42f 100644
--- a/drivers/net/wireless/orinoco/hermes.c
+++ b/drivers/net/wireless/orinoco/hermes.c
@@ -261,14 +261,12 @@ static int hermes_docmd_wait(struct hermes *hw, u16 cmd, u16 parm0,
err = hermes_issue_cmd(hw, cmd, parm0, 0, 0);
if (err) {
if (!hermes_present(hw)) {
- if (net_ratelimit())
- printk(KERN_WARNING "hermes @ %p: "
+ net_warn_ratelimited("hermes @ %p: "
"Card removed while issuing command "
"0x%04x.\n", hw->iobase, cmd);
err = -ENODEV;
} else
- if (net_ratelimit())
- printk(KERN_ERR "hermes @ %p: "
+ net_err_ratelimited("hermes @ %p: "
"Error %d issuing command 0x%04x.\n",
hw->iobase, err, cmd);
goto out;
diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c
index 38ec8d1..22f3a6a 100644
--- a/drivers/net/wireless/orinoco/main.c
+++ b/drivers/net/wireless/orinoco/main.c
@@ -394,9 +394,7 @@ int orinoco_process_xmit_skb(struct sk_buff *skb,
int len = skb->len + sizeof(encaps_hdr) - (2 * ETH_ALEN);
if (skb_headroom(skb) < ENCAPS_OVERHEAD) {
- if (net_ratelimit())
- printk(KERN_ERR
- "%s: Not enough headroom for 802.2 headers %d\n",
+ net_err_ratelimited("%s: Not enough headroom for 802.2 headers %d\n",
dev->name, skb_headroom(skb));
return -ENOMEM;
}
@@ -495,8 +493,7 @@ static netdev_tx_t orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
err = hw->ops->bap_pwrite(hw, USER_BAP, &desc, sizeof(desc),
txfid, 0);
if (err) {
- if (net_ratelimit())
- printk(KERN_ERR "%s: Error %d writing Tx "
+ net_err_ratelimited("%s: Error %d writing Tx "
"descriptor to BAP\n", dev->name, err);
goto busy;
}
@@ -509,8 +506,7 @@ static netdev_tx_t orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
err = hw->ops->bap_pwrite(hw, USER_BAP, &desc, sizeof(desc),
txfid, 0);
if (err) {
- if (net_ratelimit())
- printk(KERN_ERR "%s: Error %d writing Tx "
+ net_err_ratelimited("%s: Error %d writing Tx "
"descriptor to BAP\n", dev->name, err);
goto busy;
}
@@ -554,8 +550,7 @@ static netdev_tx_t orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
txfid, NULL);
if (err) {
netif_start_queue(dev);
- if (net_ratelimit())
- printk(KERN_ERR "%s: Error %d transmitting packet\n",
+ net_err_ratelimited("%s: Error %d transmitting packet\n",
dev->name, err);
goto busy;
}
@@ -1622,8 +1617,7 @@ EXPORT_SYMBOL(__orinoco_ev_info);
static void __orinoco_ev_infdrop(struct net_device *dev, struct hermes *hw)
{
- if (net_ratelimit())
- printk(KERN_DEBUG "%s: Information frame lost.\n", dev->name);
+ net_dbg_ratelimited("%s: Information frame lost.\n", dev->name);
}
/********************************************************************/
diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c
index bdfe637..65a43d6 100644
--- a/drivers/net/wireless/orinoco/orinoco_usb.c
+++ b/drivers/net/wireless/orinoco/orinoco_usb.c
@@ -1286,8 +1286,7 @@ static netdev_tx_t ezusb_xmit(struct sk_buff *skb, struct net_device *dev)
if (err) {
netif_start_queue(dev);
- if (net_ratelimit())
- printk(KERN_ERR "%s: Error %d transmitting packet\n",
+ net_err_ratelimited("%s: Error %d transmitting packet\n",
dev->name, err);
goto busy;
}
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index 57e3af8..1609084 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -212,10 +212,8 @@ static void p54p_check_rx_ring(struct ieee80211_hw *dev, u32 *index,
}
if (unlikely(len > priv->common.rx_mtu)) {
- if (net_ratelimit())
- dev_err(&priv->pdev->dev, "rx'd frame size "
- "exceeds length threshold.\n");
-
+ net_ratelimited_function(dev_err, &priv->pdev->dev,
+ "rx'd frame size exceeds length threshold.\n");
len = priv->common.rx_mtu;
}
dma_addr = le32_to_cpu(desc->host_addr);
--
1.8.2.1
^ permalink raw reply related
* RE: [Ilw] drivers/net/wireless/iwlwifi/dvm/tx.c:456 iwlagn_tx_skb+0x6c5/0x883()
From: Grumbach, Emmanuel @ 2013-10-15 10:52 UTC (permalink / raw)
To: Sander Eikelenboom, John W. Linville, Berg, Johannes,
ilw@linux.intel.com
Cc: ilw@linux.intel.com, netdev@vger.kernel.org,
linux-wireless@vger.kernel.org
In-Reply-To: <9010061839.20131015123940@eikelenboom.it>
>
> Hi,
>
> I'm having a:
>
> 02:00.0 Network controller: Intel Corporation Centrino Advanced-N 6235 (rev
> 24)
>
> And i'm running into this warning on boot with a 3.11.2 and 3.12-rc5 kernel.
>
> [ 23.904950] ------------[ cut here ]------------
> [ 23.904957] WARNING: CPU: 0 PID: 2531 at
> drivers/net/wireless/iwlwifi/dvm/tx.c:456 iwlagn_tx_skb+0x6c5/0x883()
Can you reproduce easily?
If yes, please reproduce with debug parameters:
modprobe iwlwifi debug=0xC0800000
Also, please enable MAC80211_HT_DEBUG
Thanks
^ permalink raw reply
* drivers/net/wireless/iwlwifi/dvm/tx.c:456 iwlagn_tx_skb+0x6c5/0x883()
From: Sander Eikelenboom @ 2013-10-15 10:39 UTC (permalink / raw)
To: John W. Linville, johannes.berg, ilw; +Cc: ilw, linux-wireless, netdev
Hi,
I'm having a:
02:00.0 Network controller: Intel Corporation Centrino Advanced-N 6235 (rev 24)
And i'm running into this warning on boot with a 3.11.2 and 3.12-rc5 kernel.
[ 23.904950] ------------[ cut here ]------------
[ 23.904957] WARNING: CPU: 0 PID: 2531 at drivers/net/wireless/iwlwifi/dvm/tx.c:456 iwlagn_tx_skb+0x6c5/0x883()
[ 23.904959] Modules linked in:
[ 23.904962] CPU: 0 PID: 2531 Comm: hostapd Not tainted 3.12.0-rc5+ #1
[ 23.904963] Hardware name: /D53427RKE, BIOS RKPPT10H.86A.0017.2013.0425.1251 04/25/2013
[ 23.904966] 0000000000000000 0000000000000009 ffffffff8189aa62 0000000000000000
[ 23.904968] ffffffff8105a4f2 ffff880058339a48 ffffffff815f8a04 0000000000000000
[ 23.904970] ffff8800560097b0 0000000000000208 0000000000000000 ffff8800561a9e5e
[ 23.904971] Call Trace:
[ 23.904977] [<ffffffff8189aa62>] ? dump_stack+0x41/0x51
[ 23.904981] [<ffffffff8105a4f2>] ? warn_slowpath_common+0x78/0x90
[ 23.904984] [<ffffffff815f8a04>] ? iwlagn_tx_skb+0x6c5/0x883
[ 23.904986] [<ffffffff815f8a04>] ? iwlagn_tx_skb+0x6c5/0x883
[ 23.904989] [<ffffffff818a0040>] ? put_cred+0x15/0x15
[ 23.904991] [<ffffffff815f6db4>] ? iwlagn_mac_tx+0x19/0x2f
[ 23.904995] [<ffffffff8186cc45>] ? __ieee80211_tx+0x226/0x29b
[ 23.904998] [<ffffffff8186e6bd>] ? ieee80211_tx+0xa6/0xb5
[ 23.905001] [<ffffffff8186e98b>] ? ieee80211_monitor_start_xmit+0x1e9/0x204
[ 23.905005] [<ffffffff8171ce5f>] ? dev_hard_start_xmit+0x271/0x3ec
[ 23.905008] [<ffffffff817351ac>] ? sch_direct_xmit+0x66/0x164
[ 23.905010] [<ffffffff8171d1bf>] ? dev_queue_xmit+0x1e5/0x3c8
[ 23.905013] [<ffffffff817fac5a>] ? packet_sendmsg+0xac5/0xb3d
[ 23.905017] [<ffffffff81709a09>] ? sock_sendmsg+0x37/0x52
[ 23.905020] [<ffffffff810f9e0c>] ? __do_fault+0x338/0x36b
[ 23.905023] [<ffffffff81713820>] ? verify_iovec+0x44/0x94
[ 23.905025] [<ffffffff81709e63>] ? ___sys_sendmsg+0x1f1/0x283
[ 23.905029] [<ffffffff81140a73>] ? __inode_wait_for_writeback+0x67/0xae
[ 23.905031] [<ffffffff8111735e>] ? __cache_free.isra.46+0x178/0x187
[ 23.905033] [<ffffffff811173b1>] ? kmem_cache_free+0x44/0x84
[ 23.905036] [<ffffffff81132c22>] ? dentry_kill+0x13d/0x149
[ 23.905038] [<ffffffff81132f6f>] ? dput+0xe5/0xef
[ 23.905041] [<ffffffff81136e04>] ? fget_light+0x2e/0x7c
[ 23.905043] [<ffffffff8170ae62>] ? __sys_sendmsg+0x39/0x57
[ 23.905046] [<ffffffff818a7e39>] ? system_call_fastpath+0x16/0x1b
[ 23.905047] ---[ end trace 1b3eb79359c1d1e6 ]---
--
Sander
^ permalink raw reply
* Re: [PATCH 3.12] mwifiex: fix SDIO interrupt lost issue
From: Daniel Mack @ 2013-10-15 10:38 UTC (permalink / raw)
To: Bing Zhao, linux-wireless
Cc: John W. Linville, Sven Neumann, Andreas Fenkart, Dylan Reid,
Paul Stewart, Amitkumar Karwar
In-Reply-To: <1380304538-2816-1-git-send-email-bzhao@marvell.com>
On 27.09.2013 19:55, Bing Zhao wrote:
> From: Amitkumar Karwar <akarwar@marvell.com>
>
> 601216e "mwifiex: process RX packets in SDIO IRQ thread directly"
> introduced a command timeout issue which can be reproduced easily on
> an AM33xx platform using a test application written by Daniel Mack:
>
> https://gist.github.com/zonque/6579314
>
> mwifiex_main_process() is called from both the SDIO handler and
> the workqueue. In case an interrupt occurs right after the
> int_status check, but before updating the mwifiex_processing flag,
> this interrupt gets lost, resulting in a command timeout and
> consequently a card reset.
>
> Let main_proc_lock protect both int_status and mwifiex_processing
> flag. This fixes the interrupt lost issue.
John, could you take this patch trough your tree?
Thanks,
Daniel
>
> Cc: <stable@vger.kernel.org> # 3.7+
> Reported-by: Sven Neumann <s.neumann@raumfeld.com>
> Reported-by: Andreas Fenkart <andreas.fenkart@streamunlimited.com>
> Tested-by: Daniel Mack <zonque@gmail.com>
> Reviewed-by: Dylan Reid <dgreid@chromium.org>
> Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
> Signed-off-by: Bing Zhao <bzhao@marvell.com>
> Signed-off-by: Paul Stewart <pstew@chromium.org>
> ---
> drivers/net/wireless/mwifiex/main.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
> index fd77833..c2b91f5 100644
> --- a/drivers/net/wireless/mwifiex/main.c
> +++ b/drivers/net/wireless/mwifiex/main.c
> @@ -358,10 +358,12 @@ process_start:
> }
> } while (true);
>
> - if ((adapter->int_status) || IS_CARD_RX_RCVD(adapter))
> + spin_lock_irqsave(&adapter->main_proc_lock, flags);
> + if ((adapter->int_status) || IS_CARD_RX_RCVD(adapter)) {
> + spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
> goto process_start;
> + }
>
> - spin_lock_irqsave(&adapter->main_proc_lock, flags);
> adapter->mwifiex_processing = false;
> spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
>
>
^ permalink raw reply
* [PATCH] mac80211: fixes for mesh powersave logic
From: Marco Porsch @ 2013-10-15 10:29 UTC (permalink / raw)
To: johannes; +Cc: linux-wireless, devel, Marco Porsch
This patch fixes errors in the mesh powersave logic which
cause that remote peers do not get peer power mode change
notifications and mesh peer service periods (MPSPs) got
stuck.
When closing a peer link, set the (now invalid) peer-specific
power mode to 'unknown'.
Avoid overhead when local power mode is unchanged.
Reliably clear MPSP flags on peering status update.
Avoid MPSP flags getting stuck by not requesting a further
MPSP ownership if we already are an MPSP owner.
Signed-off-by: Marco Porsch <marco@cozybit.com>
---
net/mac80211/cfg.c | 4 ++--
net/mac80211/mesh_plink.c | 3 ++-
net/mac80211/mesh_ps.c | 33 ++++++++++++++++++---------------
3 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index b0a651c..f1e1944 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1342,8 +1342,8 @@ static int sta_apply_parameters(struct ieee80211_local *local,
sta->plink_state = params->plink_state;
ieee80211_mps_sta_status_update(sta);
- changed |=
- ieee80211_mps_local_status_update(sdata);
+ changed |= ieee80211_mps_set_sta_local_pm(sta,
+ NL80211_MESH_POWER_UNKNOWN);
break;
default:
/* nothing */
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index 6b65d50..4301aa5 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -222,7 +222,8 @@ static u32 __mesh_plink_deactivate(struct sta_info *sta)
mesh_path_flush_by_nexthop(sta);
ieee80211_mps_sta_status_update(sta);
- changed |= ieee80211_mps_local_status_update(sdata);
+ changed |= ieee80211_mps_set_sta_local_pm(sta,
+ NL80211_MESH_POWER_UNKNOWN);
return changed;
}
diff --git a/net/mac80211/mesh_ps.c b/net/mac80211/mesh_ps.c
index 22290a9..0f79b78 100644
--- a/net/mac80211/mesh_ps.c
+++ b/net/mac80211/mesh_ps.c
@@ -152,6 +152,9 @@ u32 ieee80211_mps_set_sta_local_pm(struct sta_info *sta,
{
struct ieee80211_sub_if_data *sdata = sta->sdata;
+ if (sta->local_pm == pm)
+ return 0;
+
mps_dbg(sdata, "local STA operates in mode %d with %pM\n",
pm, sta->sta.addr);
@@ -245,6 +248,14 @@ void ieee80211_mps_sta_status_update(struct sta_info *sta)
do_buffer = (pm != NL80211_MESH_POWER_ACTIVE);
+ /* clear the MPSP flags for non-peers or active STA */
+ if (sta->plink_state != NL80211_PLINK_ESTAB) {
+ clear_sta_flag(sta, WLAN_STA_MPSP_OWNER);
+ clear_sta_flag(sta, WLAN_STA_MPSP_RECIPIENT);
+ } else if (!do_buffer) {
+ clear_sta_flag(sta, WLAN_STA_MPSP_OWNER);
+ }
+
/* Don't let the same PS state be set twice */
if (test_sta_flag(sta, WLAN_STA_PS_STA) == do_buffer)
return;
@@ -257,14 +268,6 @@ void ieee80211_mps_sta_status_update(struct sta_info *sta)
} else {
ieee80211_sta_ps_deliver_wakeup(sta);
}
-
- /* clear the MPSP flags for non-peers or active STA */
- if (sta->plink_state != NL80211_PLINK_ESTAB) {
- clear_sta_flag(sta, WLAN_STA_MPSP_OWNER);
- clear_sta_flag(sta, WLAN_STA_MPSP_RECIPIENT);
- } else if (!do_buffer) {
- clear_sta_flag(sta, WLAN_STA_MPSP_OWNER);
- }
}
static void mps_set_sta_peer_pm(struct sta_info *sta,
@@ -444,8 +447,7 @@ static void mpsp_qos_null_append(struct sta_info *sta,
*/
static void mps_frame_deliver(struct sta_info *sta, int n_frames)
{
- struct ieee80211_sub_if_data *sdata = sta->sdata;
- struct ieee80211_local *local = sdata->local;
+ struct ieee80211_local *local = sta->sdata->local;
int ac;
struct sk_buff_head frames;
struct sk_buff *skb;
@@ -558,10 +560,10 @@ void ieee80211_mpsp_trigger_process(u8 *qc, struct sta_info *sta,
}
/**
- * ieee80211_mps_frame_release - release buffered frames in response to beacon
+ * ieee80211_mps_frame_release - release frames buffered due to mesh power save
*
* @sta: mesh STA
- * @elems: beacon IEs
+ * @elems: IEs of beacon or probe response
*
* For peers if we have individually-addressed frames buffered or the peer
* indicates buffered frames, send a corresponding MPSP trigger frame. Since
@@ -588,9 +590,10 @@ void ieee80211_mps_frame_release(struct sta_info *sta,
(!elems->awake_window || !le16_to_cpu(*elems->awake_window)))
return;
- for (ac = 0; ac < IEEE80211_NUM_ACS; ac++)
- buffer_local += skb_queue_len(&sta->ps_tx_buf[ac]) +
- skb_queue_len(&sta->tx_filtered[ac]);
+ if (!test_sta_flag(sta, WLAN_STA_MPSP_OWNER))
+ for (ac = 0; ac < IEEE80211_NUM_ACS; ac++)
+ buffer_local += skb_queue_len(&sta->ps_tx_buf[ac]) +
+ skb_queue_len(&sta->tx_filtered[ac]);
if (!has_buffered && !buffer_local)
return;
--
1.8.1.2
^ permalink raw reply related
* Re: [PATCH] cfg80211: fix channel to frequency mapping in 5.9GHz range
From: Dennis H Jensen @ 2013-10-15 9:40 UTC (permalink / raw)
To: Johannes Berg; +Cc: linville, linux-wireless
In-Reply-To: <1381763193.13092.19.camel@jlt4.sipsolutions.net>
On Mon, 2013-10-14 at 17:06 +0200, Johannes Berg wrote:
> On Mon, 2013-10-14 at 16:58 +0200, Dennis H Jensen wrote:
>
> > > > The commit 59eb21a6504731fc16db4cf9463065dd61093e08 moved those channels
> > > > to 4.9 GHz but left a hole in the 5.9 Ghz range.
> > >
> > > But there was no +/- 15 before, so what gives?
> >
> > Well no :) but there also wasn't a special case for that particular
> > channel set (182 - 196).
>
> Yes, but then before 5910 would have been channel 182. Now you're making
> it channel 197. That doesn't really make sense at all.
OK, fair enough, but the fact is that there is a hole in the frequencies
that were added in 802.11p.
> > In case that doesn't do it. What is needed to get channel 182 to be 5910
> > MHz as Annex E defines for the US and Europe? Channel to frequency
> > mapping based on operating class?
>
> Annex E is the 802.11 spec, to get something into that ...
You misunderstood me; the European operating class 14, for example,
states that channel 182 is to be 5910.
Best regards,
Dennis
^ permalink raw reply
* [PATCH 2/2] ath10k: return better errno for unsupported pdev params
From: Bartosz Markowski @ 2013-10-15 7:55 UTC (permalink / raw)
To: ath10k; +Cc: linux-wireless, Bartosz Markowski
In-Reply-To: <1381823732-10128-1-git-send-email-bartosz.markowski@tieto.com>
Return -EOPNOTSUPP if given parameter is not supported by firmware.
Signed-off-by: Bartosz Markowski <bartosz.markowski@tieto.com>
---
drivers/net/wireless/ath/ath10k/wmi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index ea2669b..b28bd2d3 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -2119,7 +2119,7 @@ int ath10k_wmi_pdev_set_param(struct ath10k *ar, u32 id, u32 value)
if (id == WMI_PDEV_PARAM_UNSUPPORTED) {
ath10k_warn("pdev param %d not supported by firmware\n", id);
- return -EINVAL;
+ return -EOPNOTSUPP;
}
skb = ath10k_wmi_alloc_skb(sizeof(*cmd));
--
1.7.10
^ permalink raw reply related
* [PATCH 1/2] ath10k: rename WMI_CMD_UNDEFINED
From: Bartosz Markowski @ 2013-10-15 7:55 UTC (permalink / raw)
To: ath10k; +Cc: linux-wireless, Bartosz Markowski
Rename WMI_CMD_UNDEFINED to WMI_CMD_UNSUPPORTED. This is more
accurate here. Also return -EOPNOTSUPP instead of -EINVAL in
wmi_cmd_send().
Signed-off-by: Bartosz Markowski <bartosz.markowski@tieto.com>
---
drivers/net/wireless/ath/ath10k/wmi.c | 46 ++++++++++++++++-----------------
drivers/net/wireless/ath/ath10k/wmi.h | 2 +-
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index f9766fa..ea2669b 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -149,7 +149,7 @@ static struct wmi_cmd_map wmi_10x_cmd_map = {
.start_scan_cmdid = WMI_10X_START_SCAN_CMDID,
.stop_scan_cmdid = WMI_10X_STOP_SCAN_CMDID,
.scan_chan_list_cmdid = WMI_10X_SCAN_CHAN_LIST_CMDID,
- .scan_sch_prio_tbl_cmdid = WMI_CMD_UNDEFINED,
+ .scan_sch_prio_tbl_cmdid = WMI_CMD_UNSUPPORTED,
.pdev_set_regdomain_cmdid = WMI_10X_PDEV_SET_REGDOMAIN_CMDID,
.pdev_set_channel_cmdid = WMI_10X_PDEV_SET_CHANNEL_CMDID,
.pdev_set_param_cmdid = WMI_10X_PDEV_SET_PARAM_CMDID,
@@ -182,11 +182,11 @@ static struct wmi_cmd_map wmi_10x_cmd_map = {
.peer_mcast_group_cmdid = WMI_10X_PEER_MCAST_GROUP_CMDID,
.bcn_tx_cmdid = WMI_10X_BCN_TX_CMDID,
.pdev_send_bcn_cmdid = WMI_10X_PDEV_SEND_BCN_CMDID,
- .bcn_tmpl_cmdid = WMI_CMD_UNDEFINED,
+ .bcn_tmpl_cmdid = WMI_CMD_UNSUPPORTED,
.bcn_filter_rx_cmdid = WMI_10X_BCN_FILTER_RX_CMDID,
.prb_req_filter_rx_cmdid = WMI_10X_PRB_REQ_FILTER_RX_CMDID,
.mgmt_tx_cmdid = WMI_10X_MGMT_TX_CMDID,
- .prb_tmpl_cmdid = WMI_CMD_UNDEFINED,
+ .prb_tmpl_cmdid = WMI_CMD_UNSUPPORTED,
.addba_clear_resp_cmdid = WMI_10X_ADDBA_CLEAR_RESP_CMDID,
.addba_send_cmdid = WMI_10X_ADDBA_SEND_CMDID,
.addba_status_cmdid = WMI_10X_ADDBA_STATUS_CMDID,
@@ -211,9 +211,9 @@ static struct wmi_cmd_map wmi_10x_cmd_map = {
.p2p_dev_set_discoverability = WMI_10X_P2P_DEV_SET_DISCOVERABILITY,
.p2p_go_set_beacon_ie = WMI_10X_P2P_GO_SET_BEACON_IE,
.p2p_go_set_probe_resp_ie = WMI_10X_P2P_GO_SET_PROBE_RESP_IE,
- .p2p_set_vendor_ie_data_cmdid = WMI_CMD_UNDEFINED,
- .ap_ps_peer_param_cmdid = WMI_CMD_UNDEFINED,
- .ap_ps_peer_uapsd_coex_cmdid = WMI_CMD_UNDEFINED,
+ .p2p_set_vendor_ie_data_cmdid = WMI_CMD_UNSUPPORTED,
+ .ap_ps_peer_param_cmdid = WMI_CMD_UNSUPPORTED,
+ .ap_ps_peer_uapsd_coex_cmdid = WMI_CMD_UNSUPPORTED,
.peer_rate_retry_sched_cmdid = WMI_10X_PEER_RATE_RETRY_SCHED_CMDID,
.wlan_profile_trigger_cmdid = WMI_10X_WLAN_PROFILE_TRIGGER_CMDID,
.wlan_profile_set_hist_intvl_cmdid =
@@ -242,25 +242,25 @@ static struct wmi_cmd_map wmi_10x_cmd_map = {
.vdev_spectral_scan_enable_cmdid =
WMI_10X_VDEV_SPECTRAL_SCAN_ENABLE_CMDID,
.request_stats_cmdid = WMI_10X_REQUEST_STATS_CMDID,
- .set_arp_ns_offload_cmdid = WMI_CMD_UNDEFINED,
- .network_list_offload_config_cmdid = WMI_CMD_UNDEFINED,
- .gtk_offload_cmdid = WMI_CMD_UNDEFINED,
- .csa_offload_enable_cmdid = WMI_CMD_UNDEFINED,
- .csa_offload_chanswitch_cmdid = WMI_CMD_UNDEFINED,
- .chatter_set_mode_cmdid = WMI_CMD_UNDEFINED,
- .peer_tid_addba_cmdid = WMI_CMD_UNDEFINED,
- .peer_tid_delba_cmdid = WMI_CMD_UNDEFINED,
- .sta_dtim_ps_method_cmdid = WMI_CMD_UNDEFINED,
- .sta_uapsd_auto_trig_cmdid = WMI_CMD_UNDEFINED,
- .sta_keepalive_cmd = WMI_CMD_UNDEFINED,
+ .set_arp_ns_offload_cmdid = WMI_CMD_UNSUPPORTED,
+ .network_list_offload_config_cmdid = WMI_CMD_UNSUPPORTED,
+ .gtk_offload_cmdid = WMI_CMD_UNSUPPORTED,
+ .csa_offload_enable_cmdid = WMI_CMD_UNSUPPORTED,
+ .csa_offload_chanswitch_cmdid = WMI_CMD_UNSUPPORTED,
+ .chatter_set_mode_cmdid = WMI_CMD_UNSUPPORTED,
+ .peer_tid_addba_cmdid = WMI_CMD_UNSUPPORTED,
+ .peer_tid_delba_cmdid = WMI_CMD_UNSUPPORTED,
+ .sta_dtim_ps_method_cmdid = WMI_CMD_UNSUPPORTED,
+ .sta_uapsd_auto_trig_cmdid = WMI_CMD_UNSUPPORTED,
+ .sta_keepalive_cmd = WMI_CMD_UNSUPPORTED,
.echo_cmdid = WMI_10X_ECHO_CMDID,
.pdev_utf_cmdid = WMI_10X_PDEV_UTF_CMDID,
.dbglog_cfg_cmdid = WMI_10X_DBGLOG_CFG_CMDID,
.pdev_qvit_cmdid = WMI_10X_PDEV_QVIT_CMDID,
- .pdev_ftm_intg_cmdid = WMI_CMD_UNDEFINED,
- .vdev_set_keepalive_cmdid = WMI_CMD_UNDEFINED,
- .vdev_get_keepalive_cmdid = WMI_CMD_UNDEFINED,
- .force_fw_hang_cmdid = WMI_CMD_UNDEFINED,
+ .pdev_ftm_intg_cmdid = WMI_CMD_UNSUPPORTED,
+ .vdev_set_keepalive_cmdid = WMI_CMD_UNSUPPORTED,
+ .vdev_get_keepalive_cmdid = WMI_CMD_UNSUPPORTED,
+ .force_fw_hang_cmdid = WMI_CMD_UNSUPPORTED,
.gpio_config_cmdid = WMI_10X_GPIO_CONFIG_CMDID,
.gpio_output_cmdid = WMI_10X_GPIO_OUTPUT_CMDID,
};
@@ -611,9 +611,9 @@ static void ath10k_wmi_op_ep_tx_credits(struct ath10k *ar)
static int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb,
u32 cmd_id)
{
- int ret = -EINVAL;
+ int ret = -EOPNOTSUPP;
- if (cmd_id == WMI_CMD_UNDEFINED) {
+ if (cmd_id == WMI_CMD_UNSUPPORTED) {
ath10k_warn("wmi command %d is not supported by firmware\n",
cmd_id);
return ret;
diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
index 7692c14..78c991a 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -359,7 +359,7 @@ enum wmi_cmd_group {
#define WMI_CMD_GRP(grp_id) (((grp_id) << 12) | 0x1)
#define WMI_EVT_GRP_START_ID(grp_id) (((grp_id) << 12) | 0x1)
-#define WMI_CMD_UNDEFINED 0
+#define WMI_CMD_UNSUPPORTED 0
/* Command IDs and command events for MAIN FW. */
enum wmi_cmd_id {
--
1.7.10
^ permalink raw reply related
* Lower throughput in Ad-hoc than in Infrastructure mode?
From: Floris Van den Abeele @ 2013-10-15 7:28 UTC (permalink / raw)
To: linux-wireless
While running throughput experiments using iperf I noticed that UDP
throughput in ad-hoc mode was considerably lower than in Infrastructure
mode. The setups I'm comparing is a 802.11a ad-hoc network consisting of
two clients vs a 802.11a infrastructure network consisting of an access
point and a client (11a because the tests were run in the 5GHz band).
For ad-hoc mode I'm consistenly seeing a lower throughput than for
infrastructure mode: i.e. 22.4 Mbits/sec vs 28.2 Mbits/sec. Note that
while sniffing the medium radiotap headers report a PHY data rate of
54Mbit/s in both cases. There is no other traffic on the Wi-Fi channel
in question (44). Considering the medium access for both setups is
similair I would expect to find similair throughputs. Is this a known
issue with the linux wireless/mac80211/ath9k driver stack or is this
behaviour conform the 802.11 standard (based on my knowledge I would say
no to the latter)? My test specs are below.
For testing I'm using Sparklan WPEA-111N NIC's (AR9280). The nodes are
running OpenWrt attitude adjusment on r32482 (from 2012-06-21) with the
REGD patch enabled. I believe that this build of OpenWRT uses the
compat-wireless-2012-06-14.tar.bz2 drivers.
Kind regards,
Floris
--
Floris Van den Abeele
Department of Information Technology
Internet Based Communication Networks and Services (IBCN)
Ghent University - iMinds
Gaston Crommenlaan 8 (Bus 201), B-9050 Gent, Belgium
M: +32 (0)494 24 92 76
E: floris.vandenabeele@intec.UGent.be
W : www.ibcn.intec.UGent.be
^ permalink raw reply
* [PATCH v2] ath10k: do not warn about unsupported vdev param
From: Bartosz Markowski @ 2013-10-15 7:26 UTC (permalink / raw)
To: ath10k; +Cc: linux-wireless, Bartosz Markowski
10.X firmware does not support WMI_VDEV_PARAM_TX_ENCAP_TYPE.
It's a known limitation and we should not warn about this.
Signed-off-by: Bartosz Markowski <bartosz.markowski@tieto.com>
---
drivers/net/wireless/ath/ath10k/mac.c | 3 ++-
drivers/net/wireless/ath/ath10k/wmi.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 049eca2..97d7111 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -2085,7 +2085,8 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,
vdev_param = ar->wmi.vdev_param->tx_encap_type;
ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, vdev_param,
ATH10K_HW_TXRX_NATIVE_WIFI);
- if (ret)
+ /* 10.X firmware does not support this VDEV parameter. Do not warn */
+ if (ret && ret != -EOPNOTSUPP)
ath10k_warn("Failed to set TX encap: %d\n", ret);
if (arvif->vdev_type == WMI_VDEV_TYPE_AP) {
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index f9766fa..fa07388 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -2763,7 +2763,7 @@ int ath10k_wmi_vdev_set_param(struct ath10k *ar, u32 vdev_id,
ath10k_dbg(ATH10K_DBG_WMI,
"vdev param %d not supported by firmware\n",
param_id);
- return -EINVAL;
+ return -EOPNOTSUPP;
}
skb = ath10k_wmi_alloc_skb(sizeof(*cmd));
--
1.7.10
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox