diff options
author | Sven Eckelmann <sven@narfation.org> | 2012-03-26 10:22:45 -0400 |
---|---|---|
committer | Antonio Quartulli <ordex@autistici.org> | 2012-05-13 13:06:41 -0400 |
commit | 679695813c0e29ecab666210752c9c0b4dd9f01c (patch) | |
tree | 7d52ad5be1f3a683ce511a9f3967ce8f1abd0157 /net/batman-adv | |
parent | 8c7bf248a318444accbe0c2c5db15bd727661606 (diff) |
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>
Diffstat (limited to 'net/batman-adv')
-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 0b84bb1b62c4..dc334fa89847 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) | |||
173 | net_dev->dev_addr)) | 173 | net_dev->dev_addr)) |
174 | continue; | 174 | continue; |
175 | 175 | ||
176 | pr_warning("The newly added mac address (%pM) already exists on: %s\n", | 176 | pr_warn("The newly added mac address (%pM) already exists on: %s\n", |
177 | net_dev->dev_addr, hard_iface->net_dev->name); | 177 | net_dev->dev_addr, hard_iface->net_dev->name); |
178 | pr_warning("It is strongly recommended to keep mac addresses unique to avoid problems!\n"); | 178 | pr_warn("It is strongly recommended to keep mac addresses unique to avoid problems!\n"); |
179 | } | 179 | } |
180 | rcu_read_unlock(); | 180 | rcu_read_unlock(); |
181 | } | 181 | } |
diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 8e74d9763be3..f47299f22c68 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, | |||
45 | goto send_skb_err; | 45 | goto send_skb_err; |
46 | 46 | ||
47 | if (!(hard_iface->net_dev->flags & IFF_UP)) { | 47 | if (!(hard_iface->net_dev->flags & IFF_UP)) { |
48 | pr_warning("Interface %s is not up - can't send packet via that interface!\n", | 48 | pr_warn("Interface %s is not up - can't send packet via that interface!\n", |
49 | hard_iface->net_dev->name); | 49 | hard_iface->net_dev->name); |
50 | goto send_skb_err; | 50 | goto send_skb_err; |
51 | } | 51 | } |
52 | 52 | ||