Subject: Spidernet - add net_ratelimit to suppress long output From: James K Lewis This patch adds net_ratelimit to many of the printks in order to limit extraneous warning messages (created in response to Bug 28554). This has been tested, please apply. Signed-off-by: James K Lewis --- drivers/net/spider_net.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Index: linux-2.6/drivers/net/spider_net.c =================================================================== --- linux-2.6.orig/drivers/net/spider_net.c +++ linux-2.6/drivers/net/spider_net.c @@ -736,7 +736,7 @@ spider_net_release_tx_chain(struct spide case SPIDER_NET_DESCR_RESPONSE_ERROR: case SPIDER_NET_DESCR_PROTECTION_ERROR: case SPIDER_NET_DESCR_FORCE_END: - if (netif_msg_tx_err(card)) + if (netif_msg_tx_err(card) && net_ratelimit()) pr_err("%s: forcing end of tx descriptor " "with status x%02x\n", card->netdev->name, status); @@ -903,7 +903,7 @@ spider_net_pass_skb_up(struct spider_net /* the cases we'll throw away the packet immediately */ if (data_error & SPIDER_NET_DESTROY_RX_FLAGS) { - if (netif_msg_rx_err(card)) + if (netif_msg_rx_err(card) && net_ratelimit()) pr_err("error in received descriptor found, " "data_status=x%08x, data_error=x%08x\n", data_status, data_error); @@ -993,7 +993,7 @@ spider_net_decode_one_descr(struct spide if ( (status == SPIDER_NET_DESCR_RESPONSE_ERROR) || (status == SPIDER_NET_DESCR_PROTECTION_ERROR) || (status == SPIDER_NET_DESCR_FORCE_END) ) { - if (netif_msg_rx_err(card)) + if (netif_msg_rx_err(card) && net_ratelimit()) pr_err("%s: dropping RX descriptor with state %d\n", card->netdev->name, status); card->netdev_stats.rx_dropped++; @@ -1005,7 +1005,7 @@ spider_net_decode_one_descr(struct spide if ( (status != SPIDER_NET_DESCR_COMPLETE) && (status != SPIDER_NET_DESCR_FRAME_END) ) { - if (netif_msg_rx_err(card)) { + if (netif_msg_rx_err(card) && net_ratelimit()) { pr_err("%s: RX descriptor with state %d\n", card->netdev->name, status); card->spider_stats.rx_desc_unk_state++;