Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-2.6.git] / drivers / net / iseries_veth.c

diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index e6e972d..9ece1fd 100644 (file)
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -69,6 +69,7 @@
 #include <linux/mm.h>
 #include <linux/ethtool.h>
 #include <linux/if_ether.h>
+#include <linux/slab.h>
 
 #include <asm/abs_addr.h>
 #include <asm/iseries/mf.h>
@@ -884,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)
@@ -961,15 +953,15 @@ static void veth_set_multicast_list(struct net_device *dev)
                        (netdev_mc_count(dev) > VETH_MAX_MCAST)) {
                port->promiscuous = 1;
        } else {
-               struct dev_mc_list *dmi;
+               struct netdev_hw_addr *ha;
 
                port->promiscuous = 0;
 
                /* Update table */
                port->num_mcast = 0;
 
-               netdev_for_each_mc_addr(dmi, dev) {
-                       u8 *addr = dmi->dmi_addr;
+               netdev_for_each_mc_addr(ha, dev) {
+                       u8 *addr = ha->addr;
                        u64 xaddr = 0;
 
                        if (addr[0] & 0x01) {/* multicast address? */
@@ -1008,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 = {
@@ -1523,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;
@@ -1604,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 */
@@ -1657,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 */