Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0294ca0d authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

batman-adv: Prefix soft-interface local static functions with batadv_ 



All non-static symbols of batman-adv were prefixed with batadv_ to avoid
collisions with other symbols of the kernel. Other symbols of batman-adv
should use the same prefix to keep the naming scheme consistent.

Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
parent bb079c82

net/batman-adv/soft-interface.c

+41 −39
Original line number Original line Diff line number Diff line
@@ -37,23 +37,23 @@ 
#include "bridge_loop_avoidance.h"

#include "bridge_loop_avoidance.h"









static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd);

static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd);

static void bat_get_drvinfo(struct net_device *dev,

static void batadv_get_drvinfo(struct net_device *dev,

			       struct ethtool_drvinfo *info);

			       struct ethtool_drvinfo *info);

static u32 bat_get_msglevel(struct net_device *dev);

static u32 batadv_get_msglevel(struct net_device *dev);

static void bat_set_msglevel(struct net_device *dev, u32 value);

static void batadv_set_msglevel(struct net_device *dev, u32 value);

static u32 bat_get_link(struct net_device *dev);

static u32 batadv_get_link(struct net_device *dev);

static void batadv_get_strings(struct net_device *dev, u32 stringset, u8 *data);

static void batadv_get_strings(struct net_device *dev, u32 stringset, u8 *data);

static void batadv_get_ethtool_stats(struct net_device *dev,

static void batadv_get_ethtool_stats(struct net_device *dev,

				     struct ethtool_stats *stats, u64 *data);

				     struct ethtool_stats *stats, u64 *data);

static int batadv_get_sset_count(struct net_device *dev, int stringset);

static int batadv_get_sset_count(struct net_device *dev, int stringset);





static const struct ethtool_ops bat_ethtool_ops = {

static const struct ethtool_ops batadv_ethtool_ops = {

	.get_settings = bat_get_settings,

	.get_settings = batadv_get_settings,

	.get_drvinfo = bat_get_drvinfo,

	.get_drvinfo = batadv_get_drvinfo,

	.get_msglevel = bat_get_msglevel,

	.get_msglevel = batadv_get_msglevel,

	.set_msglevel = bat_set_msglevel,

	.set_msglevel = batadv_set_msglevel,

	.get_link = bat_get_link,

	.get_link = batadv_get_link,

	.get_strings = batadv_get_strings,

	.get_strings = batadv_get_strings,

	.get_ethtool_stats = batadv_get_ethtool_stats,

	.get_ethtool_stats = batadv_get_ethtool_stats,

	.get_sset_count = batadv_get_sset_count,

	.get_sset_count = batadv_get_sset_count,
@@ -78,25 +78,25 @@ int batadv_skb_head_push(struct sk_buff *skb, unsigned int len) 
	return 0;

	return 0;

}

}





static int interface_open(struct net_device *dev)

static int batadv_interface_open(struct net_device *dev)

{

{

	netif_start_queue(dev);

	netif_start_queue(dev);

	return 0;

	return 0;

}

}





static int interface_release(struct net_device *dev)

static int batadv_interface_release(struct net_device *dev)

{

{

	netif_stop_queue(dev);

	netif_stop_queue(dev);

	return 0;

	return 0;

}

}





static struct net_device_stats *interface_stats(struct net_device *dev)

static struct net_device_stats *batadv_interface_stats(struct net_device *dev)

{

{

	struct bat_priv *bat_priv = netdev_priv(dev);

	struct bat_priv *bat_priv = netdev_priv(dev);

	return &bat_priv->stats;

	return &bat_priv->stats;

}

}





static int interface_set_mac_addr(struct net_device *dev, void *p)

static int batadv_interface_set_mac_addr(struct net_device *dev, void *p)

{

{

	struct bat_priv *bat_priv = netdev_priv(dev);

	struct bat_priv *bat_priv = netdev_priv(dev);

	struct sockaddr *addr = p;

	struct sockaddr *addr = p;
@@ -116,7 +116,7 @@ static int interface_set_mac_addr(struct net_device *dev, void *p) 
	return 0;

	return 0;

}

}





static int interface_change_mtu(struct net_device *dev, int new_mtu)

static int batadv_interface_change_mtu(struct net_device *dev, int new_mtu)

{

{

	/* check ranges */

	/* check ranges */

	if ((new_mtu < 68) || (new_mtu > batadv_hardif_min_mtu(dev)))

	if ((new_mtu < 68) || (new_mtu > batadv_hardif_min_mtu(dev)))
@@ -127,7 +127,8 @@ static int interface_change_mtu(struct net_device *dev, int new_mtu) 
	return 0;

	return 0;

}

}





static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)

static int batadv_interface_tx(struct sk_buff *skb,

			       struct net_device *soft_iface)

{

{

	struct ethhdr *ethhdr = (struct ethhdr *)skb->data;

	struct ethhdr *ethhdr = (struct ethhdr *)skb->data;

	struct bat_priv *bat_priv = netdev_priv(soft_iface);

	struct bat_priv *bat_priv = netdev_priv(soft_iface);
@@ -323,23 +324,23 @@ void batadv_interface_rx(struct net_device *soft_iface, 
	return;

	return;

}

}





static const struct net_device_ops bat_netdev_ops = {

static const struct net_device_ops batadv_netdev_ops = {

	.ndo_open = interface_open,

	.ndo_open = batadv_interface_open,

	.ndo_stop = interface_release,

	.ndo_stop = batadv_interface_release,

	.ndo_get_stats = interface_stats,

	.ndo_get_stats = batadv_interface_stats,

	.ndo_set_mac_address = interface_set_mac_addr,

	.ndo_set_mac_address = batadv_interface_set_mac_addr,

	.ndo_change_mtu = interface_change_mtu,

	.ndo_change_mtu = batadv_interface_change_mtu,

	.ndo_start_xmit = interface_tx,

	.ndo_start_xmit = batadv_interface_tx,

	.ndo_validate_addr = eth_validate_addr

	.ndo_validate_addr = eth_validate_addr

};

};





static void interface_setup(struct net_device *dev)

static void batadv_interface_setup(struct net_device *dev)

{

{

	struct bat_priv *priv = netdev_priv(dev);

	struct bat_priv *priv = netdev_priv(dev);





	ether_setup(dev);

	ether_setup(dev);





	dev->netdev_ops = &bat_netdev_ops;

	dev->netdev_ops = &batadv_netdev_ops;

	dev->destructor = free_netdev;

	dev->destructor = free_netdev;

	dev->tx_queue_len = 0;

	dev->tx_queue_len = 0;
@@ -353,7 +354,7 @@ static void interface_setup(struct net_device *dev) 
	/* generate random address */

	/* generate random address */

	eth_hw_addr_random(dev);

	eth_hw_addr_random(dev);





	SET_ETHTOOL_OPS(dev, &bat_ethtool_ops);

	SET_ETHTOOL_OPS(dev, &batadv_ethtool_ops);





	memset(priv, 0, sizeof(*priv));

	memset(priv, 0, sizeof(*priv));

}

}
@@ -364,7 +365,8 @@ struct net_device *batadv_softif_create(const char *name) 
	struct bat_priv *bat_priv;

	struct bat_priv *bat_priv;

	int ret;

	int ret;





	soft_iface = alloc_netdev(sizeof(*bat_priv), name, interface_setup);

	soft_iface = alloc_netdev(sizeof(*bat_priv), name,

				  batadv_interface_setup);





	if (!soft_iface)

	if (!soft_iface)

		goto out;

		goto out;
@@ -456,14 +458,14 @@ void batadv_softif_destroy(struct net_device *soft_iface) 




int batadv_softif_is_valid(const struct net_device *net_dev)

int batadv_softif_is_valid(const struct net_device *net_dev)

{

{

	if (net_dev->netdev_ops->ndo_start_xmit == interface_tx)

	if (net_dev->netdev_ops->ndo_start_xmit == batadv_interface_tx)

		return 1;

		return 1;





	return 0;

	return 0;

}

}





/* ethtool */

/* ethtool */

static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)

static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)

{

{

	cmd->supported = 0;

	cmd->supported = 0;

	cmd->advertising = 0;

	cmd->advertising = 0;
@@ -479,7 +481,7 @@ static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
	return 0;

	return 0;

}

}





static void bat_get_drvinfo(struct net_device *dev,

static void batadv_get_drvinfo(struct net_device *dev,

			       struct ethtool_drvinfo *info)

			       struct ethtool_drvinfo *info)

{

{

	strcpy(info->driver, "B.A.T.M.A.N. advanced");

	strcpy(info->driver, "B.A.T.M.A.N. advanced");
@@ -488,16 +490,16 @@ static void bat_get_drvinfo(struct net_device *dev, 
	strcpy(info->bus_info, "batman");

	strcpy(info->bus_info, "batman");

}

}





static u32 bat_get_msglevel(struct net_device *dev)

static u32 batadv_get_msglevel(struct net_device *dev)

{

{

	return -EOPNOTSUPP;

	return -EOPNOTSUPP;

}

}





static void bat_set_msglevel(struct net_device *dev, u32 value)

static void batadv_set_msglevel(struct net_device *dev, u32 value)

{

{

}

}





static u32 bat_get_link(struct net_device *dev)

static u32 batadv_get_link(struct net_device *dev)

{

{

	return 1;

	return 1;

}

}
@@ -508,7 +510,7 @@ static u32 bat_get_link(struct net_device *dev) 
 */

 */

static const struct {

static const struct {

	const char name[ETH_GSTRING_LEN];

	const char name[ETH_GSTRING_LEN];

} bat_counters_strings[] = {

} batadv_counters_strings[] = {

	{ "forward" },

	{ "forward" },

	{ "forward_bytes" },

	{ "forward_bytes" },

	{ "mgmt_tx" },

	{ "mgmt_tx" },
@@ -527,8 +529,8 @@ static void batadv_get_strings(struct net_device *dev, uint32_t stringset, 
			       uint8_t *data)

			       uint8_t *data)

{

{

	if (stringset == ETH_SS_STATS)

	if (stringset == ETH_SS_STATS)

		memcpy(data, bat_counters_strings,

		memcpy(data, batadv_counters_strings,

		       sizeof(bat_counters_strings));

		       sizeof(batadv_counters_strings));

}

}





static void batadv_get_ethtool_stats(struct net_device *dev,

static void batadv_get_ethtool_stats(struct net_device *dev,