The following commit has been merged in the master branch: commit 8329d7c1a0352b129ab35518d92d7835a0404917 Author: Sven Eckelmann sven@narfation.org Date: Mon Mar 26 16:22:45 2012 +0200

batman-adv: use shorter pr_warn instead of pr_warning

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/compat.h b/compat.h index 46de8b0..d8c31df 100644 --- a/compat.h +++ b/compat.h @@ -57,6 +57,13 @@

#endif /* < KERNEL_VERSION(2, 6, 34) */

+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) + +#define pr_warn pr_warning + +#endif /* < KERNEL_VERSION(2, 6, 35) */ + +

#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)

diff --git a/hard-interface.c b/hard-interface.c index daa6adc..2477d00 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -176,9 +176,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", + pr_warn("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("It is strongly recommended to keep mac addresses unique to avoid problems!\n"); } rcu_read_unlock(); } diff --git a/send.c b/send.c index 20f6e89..d24702d 100644 --- a/send.c +++ b/send.c @@ -46,7 +46,7 @@ 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", + pr_warn("Interface %s is not up - can't send packet via that interface!\n", hard_iface->net_dev->name); goto send_skb_err; }