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

Commit 5526c031 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

stmmac: do vlan cleanup 



- kill priv->vlgrp and stmmac_vlan_rx_register (used for nothing :))

Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ffcf9b76

drivers/net/stmmac/stmmac.h

+0 −3
Original line number Diff line number Diff line
@@ -78,9 +78,6 @@ struct stmmac_priv { 
	int wolenabled;

#ifdef CONFIG_STMMAC_TIMER

	struct stmmac_timer *tm;

#endif

#ifdef STMMAC_VLAN_TAG_USED

	struct vlan_group *vlgrp;

#endif

	struct plat_stmmacenet_data *plat;

};

drivers/net/stmmac/stmmac_main.c

+0 −17
Original line number Diff line number Diff line
@@ -1421,20 +1421,6 @@ static int stmmac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 
	return ret;

}



#ifdef STMMAC_VLAN_TAG_USED

static void stmmac_vlan_rx_register(struct net_device *dev,

				    struct vlan_group *grp)

{

	struct stmmac_priv *priv = netdev_priv(dev);



	DBG(probe, INFO, "%s: Setting vlgrp to %p\n", dev->name, grp);



	spin_lock(&priv->lock);

	priv->vlgrp = grp;

	spin_unlock(&priv->lock);

}

#endif



static const struct net_device_ops stmmac_netdev_ops = {

	.ndo_open = stmmac_open,

	.ndo_start_xmit = stmmac_xmit,
@@ -1445,9 +1431,6 @@ static const struct net_device_ops stmmac_netdev_ops = { 
	.ndo_tx_timeout = stmmac_tx_timeout,

	.ndo_do_ioctl = stmmac_ioctl,

	.ndo_set_config = stmmac_config,

#ifdef STMMAC_VLAN_TAG_USED

	.ndo_vlan_rx_register = stmmac_vlan_rx_register,

#endif

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller = stmmac_poll_controller,

#endif