@@ -1115,7 +1115,6 @@ static int irq_rr;
1115
1115
static int vector_net_close (struct net_device * dev )
1116
1116
{
1117
1117
struct vector_private * vp = netdev_priv (dev );
1118
- unsigned long flags ;
1119
1118
1120
1119
netif_stop_queue (dev );
1121
1120
del_timer (& vp -> tl );
@@ -1158,10 +1157,8 @@ static int vector_net_close(struct net_device *dev)
1158
1157
destroy_queue (vp -> tx_queue );
1159
1158
kfree (vp -> fds );
1160
1159
vp -> fds = NULL ;
1161
- spin_lock_irqsave (& vp -> lock , flags );
1162
1160
vp -> opened = false;
1163
1161
vp -> in_error = false;
1164
- spin_unlock_irqrestore (& vp -> lock , flags );
1165
1162
return 0 ;
1166
1163
}
1167
1164
@@ -1203,17 +1200,12 @@ static void vector_reset_tx(struct work_struct *work)
1203
1200
static int vector_net_open (struct net_device * dev )
1204
1201
{
1205
1202
struct vector_private * vp = netdev_priv (dev );
1206
- unsigned long flags ;
1207
1203
int err = - EINVAL ;
1208
1204
struct vector_device * vdevice ;
1209
1205
1210
- spin_lock_irqsave (& vp -> lock , flags );
1211
- if (vp -> opened ) {
1212
- spin_unlock_irqrestore (& vp -> lock , flags );
1206
+ if (vp -> opened )
1213
1207
return - ENXIO ;
1214
- }
1215
1208
vp -> opened = true;
1216
- spin_unlock_irqrestore (& vp -> lock , flags );
1217
1209
1218
1210
vp -> bpf = uml_vector_user_bpf (get_bpf_file (vp -> parsed ));
1219
1211
@@ -1387,8 +1379,6 @@ static int vector_net_load_bpf_flash(struct net_device *dev,
1387
1379
return -1 ;
1388
1380
}
1389
1381
1390
- spin_lock (& vp -> lock );
1391
-
1392
1382
if (vp -> bpf != NULL ) {
1393
1383
if (vp -> opened )
1394
1384
uml_vector_detach_bpf (vp -> fds -> rx_fd , vp -> bpf );
@@ -1417,15 +1407,12 @@ static int vector_net_load_bpf_flash(struct net_device *dev,
1417
1407
if (vp -> opened )
1418
1408
result = uml_vector_attach_bpf (vp -> fds -> rx_fd , vp -> bpf );
1419
1409
1420
- spin_unlock (& vp -> lock );
1421
-
1422
1410
return result ;
1423
1411
1424
1412
free_buffer :
1425
1413
release_firmware (fw );
1426
1414
1427
1415
flash_fail :
1428
- spin_unlock (& vp -> lock );
1429
1416
if (vp -> bpf != NULL )
1430
1417
kfree (vp -> bpf -> filter );
1431
1418
kfree (vp -> bpf );
@@ -1631,7 +1618,6 @@ static void vector_eth_configure(
1631
1618
INIT_WORK (& vp -> reset_tx , vector_reset_tx );
1632
1619
1633
1620
timer_setup (& vp -> tl , vector_timer_expire , 0 );
1634
- spin_lock_init (& vp -> lock );
1635
1621
1636
1622
/* FIXME */
1637
1623
dev -> netdev_ops = & vector_netdev_ops ;
0 commit comments