diff options
| author | Sven Eckelmann <sven@narfation.org> | 2012-06-03 20:19:17 (GMT) |
|---|---|---|
| committer | Antonio Quartulli <ordex@autistici.org> | 2012-06-28 06:45:05 (GMT) |
| commit | 42d0b044b7c9e5821f1bf3e2b4ea7861417c11c2 (patch) | |
| tree | 3dedf87facfbc4dd0392256e93088c18509e1391 /net/batman-adv/main.c | |
| parent | edbf7ff72312afcc502014ccf3c72c49fa55722a (diff) | |
| download | linux-42d0b044b7c9e5821f1bf3e2b4ea7861417c11c2.tar.xz | |
batman-adv: Prefix main defines with BATADV_
Reported-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv/main.c')
| -rw-r--r-- | net/batman-adv/main.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 986be72..df7335c 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -72,7 +72,7 @@ static int __init batadv_init(void) register_netdevice_notifier(&batadv_hard_if_notifier); pr_info("B.A.T.M.A.N. advanced %s (compatibility version %i) loaded\n", - SOURCE_VERSION, BATADV_COMPAT_VERSION); + BATADV_SOURCE_VERSION, BATADV_COMPAT_VERSION); return 0; } @@ -120,7 +120,8 @@ int batadv_mesh_init(struct net_device *soft_iface) if (ret < 0) goto err; - batadv_tt_local_add(soft_iface, soft_iface->dev_addr, NULL_IFINDEX); + batadv_tt_local_add(soft_iface, soft_iface->dev_addr, + BATADV_NULL_IFINDEX); ret = batadv_vis_init(bat_priv); if (ret < 0) @@ -420,7 +421,7 @@ module_exit(batadv_exit); MODULE_LICENSE("GPL"); -MODULE_AUTHOR(DRIVER_AUTHOR); -MODULE_DESCRIPTION(DRIVER_DESC); -MODULE_SUPPORTED_DEVICE(DRIVER_DEVICE); -MODULE_VERSION(SOURCE_VERSION); +MODULE_AUTHOR(BATADV_DRIVER_AUTHOR); +MODULE_DESCRIPTION(BATADV_DRIVER_DESC); +MODULE_SUPPORTED_DEVICE(BATADV_DRIVER_DEVICE); +MODULE_VERSION(BATADV_SOURCE_VERSION); |