From baabf4511814d6437eccac7ff910b9cf96b4a939 Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Wed, 2 Apr 2008 17:33:35 -0700
Subject: [PATCH] --- yaml --- r: 88181 b: refs/heads/master c:
 5da4e37e59663bd1e9eae1d717e2ceb178a485b8 h: refs/heads/master i:   88179:
 1429f8c72550cd9e139a793c4df2cdfb3853e650 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/net/phy/marvell.c |  2 --
 trunk/net/8021q/vlan_dev.c      | 15 ---------------
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index a6c06758d94b..93d2845f5227 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23556323b22fef35bdc36465b7e7439ba3748c9f
+refs/heads/master: 5da4e37e59663bd1e9eae1d717e2ceb178a485b8
diff --git a/trunk/drivers/net/phy/marvell.c b/trunk/drivers/net/phy/marvell.c
index 33539917e9b8..32a8503a7acd 100644
--- a/trunk/drivers/net/phy/marvell.c
+++ b/trunk/drivers/net/phy/marvell.c
@@ -211,8 +211,6 @@ static int m88e1111_config_init(struct phy_device *phydev)
 	}
 
 	if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
-		int temp;
-
 		temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
 		if (temp < 0)
 			return temp;
diff --git a/trunk/net/8021q/vlan_dev.c b/trunk/net/8021q/vlan_dev.c
index 41a76a05e6fd..480ea90e7dcd 100644
--- a/trunk/net/8021q/vlan_dev.c
+++ b/trunk/net/8021q/vlan_dev.c
@@ -692,20 +692,6 @@ static int vlan_dev_init(struct net_device *dev)
 	return 0;
 }
 
-static void vlan_dev_uninit(struct net_device *dev)
-{
-	struct vlan_priority_tci_mapping *pm;
-	struct vlan_dev_info *vlan = vlan_dev_info(dev);
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(vlan->egress_priority_map); i++) {
-		while ((pm = vlan->egress_priority_map[i]) != NULL) {
-			vlan->egress_priority_map[i] = pm->next;
-			kfree(pm);
-		}
-	}
-}
-
 void vlan_setup(struct net_device *dev)
 {
 	ether_setup(dev);
@@ -715,7 +701,6 @@ void vlan_setup(struct net_device *dev)
 
 	dev->change_mtu		= vlan_dev_change_mtu;
 	dev->init		= vlan_dev_init;
-	dev->uninit		= vlan_dev_uninit;
 	dev->open		= vlan_dev_open;
 	dev->stop		= vlan_dev_stop;
 	dev->set_mac_address	= vlan_dev_set_mac_address;