From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: use shorter pr_warn instead of pr_warning
Date: Mon, 26 Mar 2012 16:22:45 +0200 [thread overview]
Message-ID: <1332771765-10351-1-git-send-email-sven@narfation.org> (raw)
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
compat.h | 7 +++++++
hard-interface.c | 4 ++--
send.c | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/compat.h b/compat.h
index 95b8706..f2cf35b 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 3778977..7db9636 100644
--- a/hard-interface.c
+++ b/hard-interface.c
@@ -175,9 +175,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 af7a674..8ec33b0 100644
--- a/send.c
+++ b/send.c
@@ -45,7 +45,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;
}
--
1.7.9.1
next reply other threads:[~2012-03-26 14:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-26 14:22 Sven Eckelmann [this message]
2012-03-28 14:58 ` [B.A.T.M.A.N.] [PATCH] batman-adv: use shorter pr_warn instead of pr_warning Marek Lindner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1332771765-10351-1-git-send-email-sven@narfation.org \
--to=sven@narfation.org \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox