diff options
Diffstat (limited to 'drivers/net/iseries_veth.c')
-rw-r--r-- | drivers/net/iseries_veth.c | 41 |
1 files changed, 28 insertions, 13 deletions
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c index 855f8b2cf13b..55af32e9bf08 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/iseries_veth.c | |||
@@ -802,13 +802,14 @@ static void veth_tx_timeout(struct net_device *dev) | |||
802 | 802 | ||
803 | spin_lock_irqsave(&port->pending_gate, flags); | 803 | spin_lock_irqsave(&port->pending_gate, flags); |
804 | 804 | ||
805 | if (!port->pending_lpmask) { | ||
806 | spin_unlock_irqrestore(&port->pending_gate, flags); | ||
807 | return; | ||
808 | } | ||
809 | |||
805 | printk(KERN_WARNING "%s: Tx timeout! Resetting lp connections: %08x\n", | 810 | printk(KERN_WARNING "%s: Tx timeout! Resetting lp connections: %08x\n", |
806 | dev->name, port->pending_lpmask); | 811 | dev->name, port->pending_lpmask); |
807 | 812 | ||
808 | /* If we've timed out the queue must be stopped, which should | ||
809 | * only ever happen when there is a pending packet. */ | ||
810 | WARN_ON(! port->pending_lpmask); | ||
811 | |||
812 | for (i = 0; i < HVMAXARCHITECTEDLPS; i++) { | 813 | for (i = 0; i < HVMAXARCHITECTEDLPS; i++) { |
813 | struct veth_lpar_connection *cnx = veth_cnx[i]; | 814 | struct veth_lpar_connection *cnx = veth_cnx[i]; |
814 | 815 | ||
@@ -924,7 +925,7 @@ static int veth_transmit_to_one(struct sk_buff *skb, HvLpIndex rlp, | |||
924 | 925 | ||
925 | spin_lock_irqsave(&cnx->lock, flags); | 926 | spin_lock_irqsave(&cnx->lock, flags); |
926 | 927 | ||
927 | if (! cnx->state & VETH_STATE_READY) | 928 | if (! (cnx->state & VETH_STATE_READY)) |
928 | goto drop; | 929 | goto drop; |
929 | 930 | ||
930 | if ((skb->len - 14) > VETH_MAX_MTU) | 931 | if ((skb->len - 14) > VETH_MAX_MTU) |
@@ -1023,6 +1024,8 @@ static int veth_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1023 | 1024 | ||
1024 | lpmask = veth_transmit_to_many(skb, lpmask, dev); | 1025 | lpmask = veth_transmit_to_many(skb, lpmask, dev); |
1025 | 1026 | ||
1027 | dev->trans_start = jiffies; | ||
1028 | |||
1026 | if (! lpmask) { | 1029 | if (! lpmask) { |
1027 | dev_kfree_skb(skb); | 1030 | dev_kfree_skb(skb); |
1028 | } else { | 1031 | } else { |
@@ -1262,13 +1265,18 @@ static void veth_receive(struct veth_lpar_connection *cnx, | |||
1262 | 1265 | ||
1263 | vlan = skb->data[9]; | 1266 | vlan = skb->data[9]; |
1264 | dev = veth_dev[vlan]; | 1267 | dev = veth_dev[vlan]; |
1265 | if (! dev) | 1268 | if (! dev) { |
1266 | /* Some earlier versions of the driver sent | 1269 | /* |
1267 | broadcasts down all connections, even to | 1270 | * Some earlier versions of the driver sent |
1268 | lpars that weren't on the relevant vlan. | 1271 | * broadcasts down all connections, even to lpars |
1269 | So ignore packets belonging to a vlan we're | 1272 | * that weren't on the relevant vlan. So ignore |
1270 | not on. */ | 1273 | * packets belonging to a vlan we're not on. |
1274 | * We can also be here if we receive packets while | ||
1275 | * the driver is going down, because then dev is NULL. | ||
1276 | */ | ||
1277 | dev_kfree_skb_irq(skb); | ||
1271 | continue; | 1278 | continue; |
1279 | } | ||
1272 | 1280 | ||
1273 | port = (struct veth_port *)dev->priv; | 1281 | port = (struct veth_port *)dev->priv; |
1274 | dest = *((u64 *) skb->data) & 0xFFFFFFFFFFFF0000; | 1282 | dest = *((u64 *) skb->data) & 0xFFFFFFFFFFFF0000; |
@@ -1381,18 +1389,25 @@ void __exit veth_module_cleanup(void) | |||
1381 | { | 1389 | { |
1382 | int i; | 1390 | int i; |
1383 | 1391 | ||
1384 | vio_unregister_driver(&veth_driver); | 1392 | /* Stop the queues first to stop any new packets being sent. */ |
1393 | for (i = 0; i < HVMAXARCHITECTEDVIRTUALLANS; i++) | ||
1394 | if (veth_dev[i]) | ||
1395 | netif_stop_queue(veth_dev[i]); | ||
1385 | 1396 | ||
1397 | /* Stop the connections before we unregister the driver. This | ||
1398 | * ensures there's no skbs lying around holding the device open. */ | ||
1386 | for (i = 0; i < HVMAXARCHITECTEDLPS; ++i) | 1399 | for (i = 0; i < HVMAXARCHITECTEDLPS; ++i) |
1387 | veth_stop_connection(i); | 1400 | veth_stop_connection(i); |
1388 | 1401 | ||
1389 | HvLpEvent_unregisterHandler(HvLpEvent_Type_VirtualLan); | 1402 | HvLpEvent_unregisterHandler(HvLpEvent_Type_VirtualLan); |
1390 | 1403 | ||
1391 | /* Hypervisor callbacks may have scheduled more work while we | 1404 | /* Hypervisor callbacks may have scheduled more work while we |
1392 | * were destroying connections. Now that we've disconnected from | 1405 | * were stoping connections. Now that we've disconnected from |
1393 | * the hypervisor make sure everything's finished. */ | 1406 | * the hypervisor make sure everything's finished. */ |
1394 | flush_scheduled_work(); | 1407 | flush_scheduled_work(); |
1395 | 1408 | ||
1409 | vio_unregister_driver(&veth_driver); | ||
1410 | |||
1396 | for (i = 0; i < HVMAXARCHITECTEDLPS; ++i) | 1411 | for (i = 0; i < HVMAXARCHITECTEDLPS; ++i) |
1397 | veth_destroy_connection(i); | 1412 | veth_destroy_connection(i); |
1398 | 1413 | ||