diff options
| author | Sven Eckelmann <sven@narfation.org> | 2012-03-26 16:22:45 +0200 |
|---|---|---|
| committer | Antonio Quartulli <ordex@autistici.org> | 2012-05-13 19:06:41 +0200 |
| commit | 679695813c0e29ecab666210752c9c0b4dd9f01c (patch) | |
| tree | 7d52ad5be1f3a683ce511a9f3967ce8f1abd0157 | |
| parent | 8c7bf248a318444accbe0c2c5db15bd727661606 (diff) | |
| download | linux-3.10-679695813c0e29ecab666210752c9c0b4dd9f01c.tar.gz linux-3.10-679695813c0e29ecab666210752c9c0b4dd9f01c.tar.bz2 linux-3.10-679695813c0e29ecab666210752c9c0b4dd9f01c.zip | |
batman-adv: use shorter pr_warn instead of pr_warning
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
| -rw-r--r-- | net/batman-adv/hard-interface.c | 6 | ||||
| -rw-r--r-- | net/batman-adv/send.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 0b84bb1b62c..dc334fa8984 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -173,9 +173,9 @@ static void check_known_mac_addr(const struct net_device *net_dev) net_dev->dev_addr)) continue; - pr_warning("The newly added mac address (%pM) already exists on: %s\n", - net_dev->dev_addr, hard_iface->net_dev->name); - pr_warning("It is strongly recommended to keep mac addresses unique to avoid problems!\n"); + pr_warn("The newly added mac address (%pM) already exists on: %s\n", + net_dev->dev_addr, hard_iface->net_dev->name); + pr_warn("It is strongly recommended to keep mac addresses unique to avoid problems!\n"); } rcu_read_unlock(); } diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 8e74d9763be..f47299f22c6 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -45,8 +45,8 @@ int send_skb_packet(struct sk_buff *skb, struct hard_iface *hard_iface, goto send_skb_err; if (!(hard_iface->net_dev->flags & IFF_UP)) { - pr_warning("Interface %s is not up - can't send packet via that interface!\n", - hard_iface->net_dev->name); + pr_warn("Interface %s is not up - can't send packet via that interface!\n", + hard_iface->net_dev->name); goto send_skb_err; } |