Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-beck.git] / net / 8021q / vlan_dev.c

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 0e3b2d3e2339be908f0a631c341cb53187b750b1..4ae0d7ef62c19bff2e625b52b662b0ffb892106a 100644 (file)
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -692,6 +692,20 @@ 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);
@@ -701,6 +715,7 @@ 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;