mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
net: Convert LIMIT_NETDEBUG to net_dbg_ratelimited
Use the more common dynamic_debug capable net_dbg_ratelimited and remove the LIMIT_NETDEBUG macro. All messages are still ratelimited. Some KERN_<LEVEL> uses are changed to KERN_DEBUG. This may have some negative impact on messages that were emitted at KERN_INFO that are not not enabled at all unless DEBUG is defined or dynamic_debug is enabled. Even so, these messages are now _not_ emitted by default. This also eliminates the use of the net_msg_warn sysctl "/proc/sys/net/core/warnings". For backward compatibility, the sysctl is not removed, but it has no function. The extern declaration of net_msg_warn is removed from sock.h and made static in net/core/sysctl_net_core.c Miscellanea: o Update the sysctl documentation o Remove the embedded uses of pr_fmt o Coalesce format fragments o Realign arguments Signed-off-by: Joe Perches <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
5b61c4db49
commit
ba7a46f16d
23 changed files with 105 additions and 116 deletions
|
|
@ -426,16 +426,17 @@ static int phonet_rcv(struct sk_buff *skb, struct net_device *dev,
|
|||
|
||||
out_dev = phonet_route_output(net, pn_sockaddr_get_addr(&sa));
|
||||
if (!out_dev) {
|
||||
LIMIT_NETDEBUG(KERN_WARNING"No Phonet route to %02X\n",
|
||||
pn_sockaddr_get_addr(&sa));
|
||||
net_dbg_ratelimited("No Phonet route to %02X\n",
|
||||
pn_sockaddr_get_addr(&sa));
|
||||
goto out;
|
||||
}
|
||||
|
||||
__skb_push(skb, sizeof(struct phonethdr));
|
||||
skb->dev = out_dev;
|
||||
if (out_dev == dev) {
|
||||
LIMIT_NETDEBUG(KERN_ERR"Phonet loop to %02X on %s\n",
|
||||
pn_sockaddr_get_addr(&sa), dev->name);
|
||||
net_dbg_ratelimited("Phonet loop to %02X on %s\n",
|
||||
pn_sockaddr_get_addr(&sa),
|
||||
dev->name);
|
||||
goto out_dev;
|
||||
}
|
||||
/* Some drivers (e.g. TUN) do not allocate HW header space */
|
||||
|
|
|
|||
|
|
@ -203,8 +203,7 @@ static netdev_tx_t gprs_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
len = skb->len;
|
||||
err = pep_write(sk, skb);
|
||||
if (err) {
|
||||
LIMIT_NETDEBUG(KERN_WARNING"%s: TX error (%d)\n",
|
||||
dev->name, err);
|
||||
net_dbg_ratelimited("%s: TX error (%d)\n", dev->name, err);
|
||||
dev->stats.tx_aborted_errors++;
|
||||
dev->stats.tx_errors++;
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -272,8 +272,8 @@ static int pipe_rcv_status(struct sock *sk, struct sk_buff *skb)
|
|||
|
||||
hdr = pnp_hdr(skb);
|
||||
if (hdr->data[0] != PN_PEP_TYPE_COMMON) {
|
||||
LIMIT_NETDEBUG(KERN_DEBUG"Phonet unknown PEP type: %u\n",
|
||||
(unsigned int)hdr->data[0]);
|
||||
net_dbg_ratelimited("Phonet unknown PEP type: %u\n",
|
||||
(unsigned int)hdr->data[0]);
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
|
|
@ -304,8 +304,8 @@ static int pipe_rcv_status(struct sock *sk, struct sk_buff *skb)
|
|||
break;
|
||||
|
||||
default:
|
||||
LIMIT_NETDEBUG(KERN_DEBUG"Phonet unknown PEP indication: %u\n",
|
||||
(unsigned int)hdr->data[1]);
|
||||
net_dbg_ratelimited("Phonet unknown PEP indication: %u\n",
|
||||
(unsigned int)hdr->data[1]);
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
if (wake)
|
||||
|
|
@ -451,8 +451,8 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
|
|||
break;
|
||||
|
||||
default:
|
||||
LIMIT_NETDEBUG(KERN_DEBUG"Phonet unknown PEP message: %u\n",
|
||||
hdr->message_id);
|
||||
net_dbg_ratelimited("Phonet unknown PEP message: %u\n",
|
||||
hdr->message_id);
|
||||
err = -EINVAL;
|
||||
}
|
||||
out:
|
||||
|
|
|
|||
Loading…
Reference in a new issue