diff options
| author | Sven Eckelmann <sven@narfation.org> | 2012-05-12 02:09:29 +0200 |
|---|---|---|
| committer | Antonio Quartulli <ordex@autistici.org> | 2012-06-20 22:15:18 +0200 |
| commit | 7cf06bc6ff810178a7fb9f12aaa6b274fc520f6f (patch) | |
| tree | d2155e204af6153174f9a7f37596c21e04c65ddb /net/batman-adv/soft-interface.c | |
| parent | 08adf1512298201a53b88bb0a3d67e0dbbe0ed9b (diff) | |
| download | op-kernel-dev-7cf06bc6ff810178a7fb9f12aaa6b274fc520f6f.zip op-kernel-dev-7cf06bc6ff810178a7fb9f12aaa6b274fc520f6f.tar.gz | |
batman-adv: Prefix gateway-client non-static functions with batadv_
batman-adv can be compiled as part of the kernel instead of an module. In that
case the linker will see all non-static symbols of batman-adv and all other
non-static symbols of the kernel. This could lead to symbol collisions. A
prefix for the batman-adv symbols that defines their private namespace avoids
such a problem.
Reported-by: David Miller <davem@davemloft.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv/soft-interface.c')
| -rw-r--r-- | net/batman-adv/soft-interface.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 16e866a..bfc4fe0 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -181,14 +181,14 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) case GW_MODE_SERVER: /* gateway servers should not send dhcp * requests into the mesh */ - ret = gw_is_dhcp_target(skb, &header_len); + ret = batadv_gw_is_dhcp_target(skb, &header_len); if (ret) goto dropped; break; case GW_MODE_CLIENT: /* gateway clients should send dhcp requests * via unicast to their gateway */ - ret = gw_is_dhcp_target(skb, &header_len); + ret = batadv_gw_is_dhcp_target(skb, &header_len); if (ret) do_bcast = false; break; @@ -232,7 +232,7 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) /* unicast packet */ } else { if (atomic_read(&bat_priv->gw_mode) != GW_MODE_OFF) { - ret = gw_out_of_range(bat_priv, skb, ethhdr); + ret = batadv_gw_out_of_range(bat_priv, skb, ethhdr); if (ret) goto dropped; } |
