From patchwork Mon Mar 26 14:22:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 1615 Return-Path: Received: from v3-1039.vlinux.de (narfation.org [79.140.41.39]) by open-mesh.org (Postfix) with ESMTPS id 8BE98600756 for ; Mon, 26 Mar 2012 16:22:54 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@narfation.org; dkim-adsp=pass Received: from sven-desktop.home.narfation.org (unknown [147.102.180.182]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id CEF8C940BD; Mon, 26 Mar 2012 16:25:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=narfation.org; s=mail; t=1332771927; bh=Y96rwrttrOoIgmXyBGBYzrbzVjamYuwelyZuYnp5Gg0=; h=From:To:Cc:Subject:Date:Message-Id; b=U2cNDN2OF9FTgzgNoa9mpU1TOrArXvsQlOi9kbludQ7Z87Jaj2VmlJ07nCW2GjcuK ZkS3v1XJfS0LQXik4bi9kYDM5Aq8xOmXj3H3pEK2BtMGneTY4K6KiAoXd9i9YzM7qG 9A+8bm82GWTAYai6J64MoCAOrtSsiCByWnnAFODY= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Mon, 26 Mar 2012 16:22:45 +0200 Message-Id: <1332771765-10351-1-git-send-email-sven@narfation.org> X-Mailer: git-send-email 1.7.9.1 Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: use shorter pr_warn instead of pr_warning X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Mar 2012 14:22:54 -0000 Signed-off-by: Sven Eckelmann --- 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; }