aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMarek Lindner <lindner_marek@yahoo.de>2012-04-18 05:15:57 -0400
committerAntonio Quartulli <ordex@autistici.org>2012-06-18 12:00:59 -0400
commit519d3497c667ed2f26f0b7ea56f1451e387264d7 (patch)
tree7fc16645bd3de95b47f564d2faab4d9e4e1a82b9 /net
parentf8214865a55f805e65c33350bc0f1eb46dd8433d (diff)
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>
Diffstat (limited to 'net')
-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,
1241} 1241}
1242 1242
1243static struct bat_algo_ops batman_iv __read_mostly = { 1243static struct bat_algo_ops batman_iv __read_mostly = {
1244 .name = "BATMAN IV", 1244 .name = "BATMAN_IV",
1245 .bat_iface_enable = bat_iv_ogm_iface_enable, 1245 .bat_iface_enable = bat_iv_ogm_iface_enable,
1246 .bat_iface_disable = bat_iv_ogm_iface_disable, 1246 .bat_iface_disable = bat_iv_ogm_iface_disable,
1247 .bat_iface_update_mac = bat_iv_ogm_iface_update_mac, 1247 .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 @@
40 * list traversals just rcu-locked */ 40 * list traversals just rcu-locked */
41struct list_head hardif_list; 41struct list_head hardif_list;
42static int (*recv_packet_handler[256])(struct sk_buff *, struct hard_iface *); 42static int (*recv_packet_handler[256])(struct sk_buff *, struct hard_iface *);
43char bat_routing_algo[20] = "BATMAN IV"; 43char bat_routing_algo[20] = "BATMAN_IV";
44static struct hlist_head bat_algo_list; 44static struct hlist_head bat_algo_list;
45 45
46unsigned char broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; 46unsigned char broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};