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

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
...@@ -78,9 +78,6 @@ struct stmmac_priv { ...@@ -78,9 +78,6 @@ struct stmmac_priv {
int wolenabled; int wolenabled;
#ifdef CONFIG_STMMAC_TIMER #ifdef CONFIG_STMMAC_TIMER
struct stmmac_timer *tm; struct stmmac_timer *tm;
#endif
#ifdef STMMAC_VLAN_TAG_USED
struct vlan_group *vlgrp;
#endif #endif
struct plat_stmmacenet_data *plat; struct plat_stmmacenet_data *plat;
}; };
......
...@@ -1421,20 +1421,6 @@ static int stmmac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ...@@ -1421,20 +1421,6 @@ static int stmmac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
return ret; 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 = { static const struct net_device_ops stmmac_netdev_ops = {
.ndo_open = stmmac_open, .ndo_open = stmmac_open,
.ndo_start_xmit = stmmac_xmit, .ndo_start_xmit = stmmac_xmit,
...@@ -1445,9 +1431,6 @@ static const struct net_device_ops stmmac_netdev_ops = { ...@@ -1445,9 +1431,6 @@ static const struct net_device_ops stmmac_netdev_ops = {
.ndo_tx_timeout = stmmac_tx_timeout, .ndo_tx_timeout = stmmac_tx_timeout,
.ndo_do_ioctl = stmmac_ioctl, .ndo_do_ioctl = stmmac_ioctl,
.ndo_set_config = stmmac_config, .ndo_set_config = stmmac_config,
#ifdef STMMAC_VLAN_TAG_USED
.ndo_vlan_rx_register = stmmac_vlan_rx_register,
#endif
#ifdef CONFIG_NET_POLL_CONTROLLER #ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = stmmac_poll_controller, .ndo_poll_controller = stmmac_poll_controller,
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment