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

Commit b3020061 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

vlan: propogate ethtool speed values 



This enables more ethtool information. The speed and settings of the
underlying device are propagated up. This makes services like SNMP that
use ethtool to get speed setting, work when managing a vlan, without adding
silly heurtistics into SNMP daemon.

For the driver info, just use existing driver strings.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3717746e

net/8021q/vlan.c

+4 −4
Original line number Diff line number Diff line
@@ -46,10 +46,10 @@ int vlan_net_id; 
/* Our listing of VLAN group(s) */

static struct hlist_head vlan_group_hash[VLAN_GRP_HASH_SIZE];



static char vlan_fullname[] = "802.1Q VLAN Support";

static char vlan_version[] = DRV_VERSION;

static char vlan_copyright[] = "Ben Greear <greearb@candelatech.com>";

static char vlan_buggyright[] = "David S. Miller <davem@redhat.com>";

const char vlan_fullname[] = "802.1Q VLAN Support";

const char vlan_version[] = DRV_VERSION;

static const char vlan_copyright[] = "Ben Greear <greearb@candelatech.com>";

static const char vlan_buggyright[] = "David S. Miller <davem@redhat.com>";



static struct packet_type vlan_packet_type = {

	.type = __constant_htons(ETH_P_8021Q),

net/8021q/vlan.h

+4 −2
Original line number Diff line number Diff line
@@ -108,8 +108,10 @@ static inline int vlan_gvrp_init(void) { return 0; } 
static inline void vlan_gvrp_uninit(void) {}

#endif



int vlan_netlink_init(void);

void vlan_netlink_fini(void);

extern const char vlan_fullname[];

extern const char vlan_version[];

extern int vlan_netlink_init(void);

extern void vlan_netlink_fini(void);



extern struct rtnl_link_ops vlan_link_ops;

net/8021q/vlan_dev.c

+22 −0
Original line number Diff line number Diff line
@@ -648,6 +648,26 @@ static void vlan_dev_uninit(struct net_device *dev) 
	}

}



static int vlan_ethtool_get_settings(struct net_device *dev,

				     struct ethtool_cmd *cmd)

{

	const struct vlan_dev_info *vlan = vlan_dev_info(dev);

	struct net_device *real_dev = vlan->real_dev;



	if (!real_dev->ethtool_ops->get_settings)

		return -EOPNOTSUPP;



	return real_dev->ethtool_ops->get_settings(real_dev, cmd);

}



static void vlan_ethtool_get_drvinfo(struct net_device *dev,

				     struct ethtool_drvinfo *info)

{

	strcpy(info->driver, vlan_fullname);

	strcpy(info->version, vlan_version);

	strcpy(info->fw_version, "N/A");

}



static u32 vlan_ethtool_get_rx_csum(struct net_device *dev)

{

	const struct vlan_dev_info *vlan = vlan_dev_info(dev);
@@ -672,6 +692,8 @@ static u32 vlan_ethtool_get_flags(struct net_device *dev) 
}



static const struct ethtool_ops vlan_ethtool_ops = {

	.get_settings	        = vlan_ethtool_get_settings,

	.get_drvinfo	        = vlan_ethtool_get_drvinfo,

	.get_link		= ethtool_op_get_link,

	.get_rx_csum		= vlan_ethtool_get_rx_csum,

	.get_flags		= vlan_ethtool_get_flags,