This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index 55af32e..43ef795 100644 (file)
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -642,7 +642,7 @@ static int veth_init_connection(u8 rlp)
        return 0;
 }
 
-static void veth_stop_connection(u8 rlp)
+static void veth_destroy_connection(u8 rlp)
 {
        struct veth_lpar_connection *cnx = veth_cnx[rlp];
 
@@ -671,18 +671,9 @@ static void veth_stop_connection(u8 rlp)
                                      HvLpEvent_Type_VirtualLan,
                                      cnx->num_ack_events,
                                      NULL, NULL);
-}
 
-static void veth_destroy_connection(u8 rlp)
-{
-       struct veth_lpar_connection *cnx = veth_cnx[rlp];
-
-       if (! cnx)
-               return;
-
-       kfree(cnx->msgs);
-       kfree(cnx);
-       veth_cnx[rlp] = NULL;
+       if (cnx->msgs)
+               kfree(cnx->msgs);
 }
 
 /*
@@ -802,14 +793,13 @@ static void veth_tx_timeout(struct net_device *dev)
 
        spin_lock_irqsave(&port->pending_gate, flags);
 
-       if (!port->pending_lpmask) {
-               spin_unlock_irqrestore(&port->pending_gate, flags);
-               return;
-       }
-
        printk(KERN_WARNING "%s: Tx timeout!  Resetting lp connections: %08x\n",
               dev->name, port->pending_lpmask);
 
+       /* If we've timed out the queue must be stopped, which should
+        * only ever happen when there is a pending packet. */
+       WARN_ON(! port->pending_lpmask);
+
        for (i = 0; i < HVMAXARCHITECTEDLPS; i++) {
                struct veth_lpar_connection *cnx = veth_cnx[i];
 
@@ -925,7 +915,7 @@ static int veth_transmit_to_one(struct sk_buff *skb, HvLpIndex rlp,
 
        spin_lock_irqsave(&cnx->lock, flags);
 
-       if (! (cnx->state & VETH_STATE_READY))
+       if (! cnx->state & VETH_STATE_READY)
                goto drop;
 
        if ((skb->len - 14) > VETH_MAX_MTU)
@@ -1024,8 +1014,6 @@ static int veth_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
        lpmask = veth_transmit_to_many(skb, lpmask, dev);
 
-       dev->trans_start = jiffies;
-
        if (! lpmask) {
                dev_kfree_skb(skb);
        } else {
@@ -1265,18 +1253,13 @@ static void veth_receive(struct veth_lpar_connection *cnx,
 
                vlan = skb->data[9];
                dev = veth_dev[vlan];
-               if (! dev) {
-                       /*
-                        * Some earlier versions of the driver sent
-                        * broadcasts down all connections, even to lpars
-                        * that weren't on the relevant vlan. So ignore
-                        * packets belonging to a vlan we're not on.
-                        * We can also be here if we receive packets while
-                        * the driver is going down, because then dev is NULL.
-                        */
-                       dev_kfree_skb_irq(skb);
+               if (! dev)
+                       /* Some earlier versions of the driver sent
+                          broadcasts down all connections, even to
+                          lpars that weren't on the relevant vlan.
+                          So ignore packets belonging to a vlan we're
+                          not on. */
                        continue;
-               }
 
                port = (struct veth_port *)dev->priv;
                dest = *((u64 *) skb->data) & 0xFFFFFFFFFFFF0000;
@@ -1389,28 +1372,12 @@ void __exit veth_module_cleanup(void)
 {
        int i;
 
-       /* Stop the queues first to stop any new packets being sent. */
-       for (i = 0; i < HVMAXARCHITECTEDVIRTUALLANS; i++)
-               if (veth_dev[i])
-                       netif_stop_queue(veth_dev[i]);
-
-       /* Stop the connections before we unregister the driver. This
-        * ensures there's no skbs lying around holding the device open. */
-       for (i = 0; i < HVMAXARCHITECTEDLPS; ++i)
-               veth_stop_connection(i);
-
-       HvLpEvent_unregisterHandler(HvLpEvent_Type_VirtualLan);
-
-       /* Hypervisor callbacks may have scheduled more work while we
-        * were stoping connections. Now that we've disconnected from
-        * the hypervisor make sure everything's finished. */
-       flush_scheduled_work();
-
        vio_unregister_driver(&veth_driver);
 
        for (i = 0; i < HVMAXARCHITECTEDLPS; ++i)
                veth_destroy_connection(i);
 
+       HvLpEvent_unregisterHandler(HvLpEvent_Type_VirtualLan);
 }
 module_exit(veth_module_cleanup);