1 files changed, 7 insertions, 22 deletions

diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index ba1de5973fb2..9ece1fd9889d 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -885,17 +885,8 @@ static void veth_stop_connection(struct veth_lpar_connection *cnx)
         veth_kick_statemachine(cnx);
         spin_unlock_irq(&cnx->lock);
 
-        /* There's a slim chance the reset code has just queued the
-         * statemachine to run in five seconds. If so we need to cancel
-         * that and requeue the work to run now. */
-        if (cancel_delayed_work(&cnx->statemachine_wq)) {
-                spin_lock_irq(&cnx->lock);
-                veth_kick_statemachine(cnx);
-                spin_unlock_irq(&cnx->lock);
-        }
-
-        /* Wait for the state machine to run. */
-        flush_scheduled_work();
+        /* ensure the statemachine runs now and waits for its completion */
+        flush_delayed_work_sync(&cnx->statemachine_wq);
 }
 
 static void veth_destroy_connection(struct veth_lpar_connection *cnx)
@@ -1009,15 +1000,10 @@ static int veth_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
         return 0;
 }
 
-static u32 veth_get_link(struct net_device *dev)
-{
-        return 1;
-}
-
 static const struct ethtool_ops ops = {
         .get_drvinfo = veth_get_drvinfo,
         .get_settings = veth_get_settings,
-        .get_link = veth_get_link,
+        .get_link = ethtool_op_get_link,
 };
 
 static const struct net_device_ops veth_netdev_ops = {
@@ -1524,7 +1510,7 @@ static void veth_receive(struct veth_lpar_connection *cnx,
 
                 skb_put(skb, length);
                 skb->protocol = eth_type_trans(skb, dev);
-                skb->ip_summed = CHECKSUM_NONE;
+                skb_checksum_none_assert(skb);
                 netif_rx(skb);  /* send it up */
                 dev->stats.rx_packets++;
                 dev->stats.rx_bytes += length;
@@ -1605,7 +1591,7 @@ static int veth_probe(struct vio_dev *vdev, const struct vio_device_id *id)
         }
         veth_dev[i] = dev;
 
-        port = (struct veth_port*)netdev_priv(dev);
+        port = netdev_priv(dev);
 
         /* Start the state machine on each connection on this vlan. If we're
          * the first dev to do so this will commence link negotiation */
@@ -1658,15 +1644,14 @@ static void __exit veth_module_cleanup(void)
         /* Disconnect our "irq" to stop events coming from the Hypervisor. */
         HvLpEvent_unregisterHandler(HvLpEvent_Type_VirtualLan);
 
-        /* Make sure any work queued from Hypervisor callbacks is finished. */
-        flush_scheduled_work();
-
         for (i = 0; i < HVMAXARCHITECTEDLPS; ++i) {
                 cnx = veth_cnx[i];
 
                 if (!cnx)
                         continue;
 
+                /* Cancel work queued from Hypervisor callbacks */
+                cancel_delayed_work_sync(&cnx->statemachine_wq);
                 /* Remove the connection from sysfs */
                 kobject_del(&cnx->kobject);
                 /* Drop the driver's reference to the connection */