2.6.32-longterm review patch.  If anyone has any objections, please let me know.

------------------

From: Steve Wise <[email protected]>

commit 73a203d2014f50d874b9e40083ad481ca70408e8 upstream.

The low level cxgb3 driver can return NET_XMIT_CN and friends.
The iw_cxgb3 driver should _not_ treat these as errors.

Signed-off-by: Steve Wise <[email protected]>
Signed-off-by: Roland Dreier <[email protected]>
Signed-off-by: Ben Hutchings <[email protected]>
Signed-off-by: Willy Tarreau <[email protected]>
---
 drivers/infiniband/hw/cxgb3/iwch_cm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c 
b/drivers/infiniband/hw/cxgb3/iwch_cm.c
index 675fc04..148f288 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -150,7 +150,7 @@ int iwch_l2t_send(struct t3cdev *tdev, struct sk_buff *skb, 
struct l2t_entry *l2
                return -EIO;
        }
        error = l2t_send(tdev, skb, l2e);
-       if (error)
+       if (error < 0)
                kfree_skb(skb);
        return error;
 }
@@ -166,7 +166,7 @@ int iwch_cxgb3_ofld_send(struct t3cdev *tdev, struct 
sk_buff *skb)
                return -EIO;
        }
        error = cxgb3_ofld_send(tdev, skb);
-       if (error)
+       if (error < 0)
                kfree_skb(skb);
        return error;
 }
-- 
1.7.12.2.21.g234cd45.dirty



Reply via email to