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

Commit e2790a4b authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Simon Wunderlich
Browse files

batman-adv: Remove ethtool .get_settings stub 



The .get_settings function pointer and the related API was deprecated.
Fortunately, batman-adv is a virtual interface and never provided any
useful information via .get_settings. The stub can therefore be
removed.

This also avoids that incorrect information is shown in ethtool about the
batadv interface.

Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Acked-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent 40ad9842

net/batman-adv/soft-interface.c

+0 −19
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ 
#include "sysfs.h"

#include "translation-table.h"



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

static void batadv_get_drvinfo(struct net_device *dev,

			       struct ethtool_drvinfo *info);

static void batadv_get_strings(struct net_device *dev, u32 stringset, u8 *data);
@@ -73,7 +72,6 @@ static void batadv_get_ethtool_stats(struct net_device *dev, 
static int batadv_get_sset_count(struct net_device *dev, int stringset);



static const struct ethtool_ops batadv_ethtool_ops = {

	.get_settings = batadv_get_settings,

	.get_drvinfo = batadv_get_drvinfo,

	.get_link = ethtool_op_get_link,

	.get_strings = batadv_get_strings,
@@ -1079,23 +1077,6 @@ struct rtnl_link_ops batadv_link_ops __read_mostly = { 
	.dellink	= batadv_softif_destroy_netlink,

};



/* ethtool */

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

{

	cmd->supported = 0;

	cmd->advertising = 0;

	ethtool_cmd_speed_set(cmd, SPEED_10);

	cmd->duplex = DUPLEX_FULL;

	cmd->port = PORT_TP;

	cmd->phy_address = 0;

	cmd->transceiver = XCVR_INTERNAL;

	cmd->autoneg = AUTONEG_DISABLE;

	cmd->maxtxpkt = 0;

	cmd->maxrxpkt = 0;



	return 0;

}



static void batadv_get_drvinfo(struct net_device *dev,

			       struct ethtool_drvinfo *info)

{