---

yaml --- r: 256587 b: refs/heads/master c: 5526c03 h: refs/heads/master i: 256585: fc87f78 256583: 459323a v: v3
git-mirror · Jul 21, 2011 · 2aec658 · 2aec658
1 parent 6b79c3f
commit 2aec658
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 21 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffcf9b767293ebc3e59e639cd4ec0dff5ca39798
+refs/heads/master: 5526c0313777d4e5a6551de6b34705ac1fce92a7
diff --git a/trunk/drivers/net/stmmac/stmmac.h b/trunk/drivers/net/stmmac/stmmac.h
@@ -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;
 };

diff --git a/trunk/drivers/net/stmmac/stmmac_main.c b/trunk/drivers/net/stmmac/stmmac_main.c
@@ -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