]> git.hungrycats.org Git - linux/commitdiff
[PATCH] e100: stepping over err return code
authorScott Feldman <scott.feldman@intel.com>
Thu, 10 Jun 2004 15:29:56 +0000 (11:29 -0400)
committerJeff Garzik <jgarzik@redhat.com>
Thu, 10 Jun 2004 15:29:56 +0000 (11:29 -0400)
* Spotted by Jay Vosburgh [fubar@us.ibm.com].  err return code was getting
stepped on in the case where we need to report low or no cb resources,
which in turn messed up the netif_stop_queue logic in xmit_frame.

Signed-off-by: scott.feldman@intel.com
drivers/net/e100.c

index 0698343c294511621418f461424af74636425267..f99d7cc1ba7253ddd3cd9a6e60873188733564a6 100644 (file)
@@ -827,8 +827,8 @@ static inline int e100_exec_cb(struct nic *nic, struct sk_buff *skb,
        cb->prev->command &= cpu_to_le16(~cb_s);
 
        while(nic->cb_to_send != nic->cb_to_use) {
-               if(unlikely((err = e100_exec_cmd(nic, nic->cuc_cmd,
-                       nic->cb_to_send->dma_addr)))) {
+               if(unlikely(e100_exec_cmd(nic, nic->cuc_cmd,
+                       nic->cb_to_send->dma_addr))) {
                        /* Ok, here's where things get sticky.  It's
                         * possible that we can't schedule the command
                         * because the controller is too busy, so