@@ -733,15 +733,15 @@ static int vrf_del_slave(struct net_device *dev, struct net_device *port_dev)
733
733
static void vrf_dev_uninit (struct net_device * dev )
734
734
{
735
735
struct net_vrf * vrf = netdev_priv (dev );
736
- struct slave_queue * queue = & vrf -> queue ;
737
- struct list_head * head = & queue -> all_slaves ;
738
- struct slave * slave , * next ;
736
+ // struct slave_queue *queue = &vrf->queue;
737
+ // struct list_head *head = &queue->all_slaves;
738
+ // struct slave *slave, *next;
739
739
740
740
vrf_rtable_destroy (vrf );
741
741
vrf_rt6_destroy (vrf );
742
742
743
- list_for_each_entry_safe (slave , next , head , list )
744
- vrf_del_slave (dev , slave -> dev );
743
+ // list_for_each_entry_safe(slave, next, head, list)
744
+ // vrf_del_slave(dev, slave->dev);
745
745
746
746
free_percpu (dev -> dstats );
747
747
dev -> dstats = NULL ;
@@ -914,6 +914,14 @@ static int vrf_validate(struct nlattr *tb[], struct nlattr *data[])
914
914
915
915
static void vrf_dellink (struct net_device * dev , struct list_head * head )
916
916
{
917
+ struct net_vrf * vrf = netdev_priv (dev );
918
+ struct slave_queue * queue = & vrf -> queue ;
919
+ struct list_head * all_slaves = & queue -> all_slaves ;
920
+ struct slave * slave , * next ;
921
+
922
+ list_for_each_entry_safe (slave , next , all_slaves , list )
923
+ vrf_del_slave (dev , slave -> dev );
924
+
917
925
unregister_netdevice_queue (dev , head );
918
926
}
919
927
0 commit comments