summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Lindner2012-04-18 11:15:57 +0200
committerAntonio Quartulli2012-06-18 18:00:59 +0200
commit519d3497c667ed2f26f0b7ea56f1451e387264d7 (patch)
tree7fc16645bd3de95b47f564d2faab4d9e4e1a82b9
parentbatman-adv: Add get_ethtool_stats() support (diff)
downloadkernel-qcow2-linux-519d3497c667ed2f26f0b7ea56f1451e387264d7.tar.gz
kernel-qcow2-linux-519d3497c667ed2f26f0b7ea56f1451e387264d7.tar.xz
kernel-qcow2-linux-519d3497c667ed2f26f0b7ea56f1451e387264d7.zip
batman-adv: avoid characters requiring shell escapes in protocol names
Reported-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de> Signed-off-by: Sven Eckelmann <sven@narfation.org>
-rw-r--r--net/batman-adv/bat_iv_ogm.c2
-rw-r--r--net/batman-adv/main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 99ec218df7f2..e94ac0b99c65 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -1241,7 +1241,7 @@ static int bat_iv_ogm_receive(struct sk_buff *skb,
}
static struct bat_algo_ops batman_iv __read_mostly = {
- .name = "BATMAN IV",
+ .name = "BATMAN_IV",
.bat_iface_enable = bat_iv_ogm_iface_enable,
.bat_iface_disable = bat_iv_ogm_iface_disable,
.bat_iface_update_mac = bat_iv_ogm_iface_update_mac,
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index bd83aa4e7c87..65b4f0824e4f 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -40,7 +40,7 @@
* list traversals just rcu-locked */
struct list_head hardif_list;
static int (*recv_packet_handler[256])(struct sk_buff *, struct hard_iface *);
-char bat_routing_algo[20] = "BATMAN IV";
+char bat_routing_algo[20] = "BATMAN_IV";
static struct hlist_head bat_algo_list;
unsigned char broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};