xen-netback: correctly return errors from netbk_count_requests()

[pandora-kernel.git] / drivers / net / xen-netback / netback.c

diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 2b9520c..cd49ba9 100644 (file)
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -911,13 +911,13 @@ static int netbk_count_requests(struct xenvif *vif,
                if (frags >= work_to_do) {
                        netdev_err(vif->dev, "Need more frags\n");
                        netbk_fatal_tx_err(vif);
-                       return -frags;
+                       return -ENODATA;
                }
 
                if (unlikely(frags >= MAX_SKB_FRAGS)) {
                        netdev_err(vif->dev, "Too many frags\n");
                        netbk_fatal_tx_err(vif);
-                       return -frags;
+                       return -E2BIG;
                }
 
                memcpy(txp, RING_GET_REQUEST(&vif->tx, cons + frags),
@@ -925,7 +925,7 @@ static int netbk_count_requests(struct xenvif *vif,
                if (txp->size > first->size) {
                        netdev_err(vif->dev, "Frag is bigger than frame.\n");
                        netbk_fatal_tx_err(vif);
-                       return -frags;
+                       return -EIO;
                }
 
                first->size -= txp->size;
@@ -935,7 +935,7 @@ static int netbk_count_requests(struct xenvif *vif,
                        netdev_err(vif->dev, "txp->offset: %x, size: %u\n",
                                 txp->offset, txp->size);
                        netbk_fatal_tx_err(vif);
-                       return -frags;
+                       return -EINVAL;
                }
        } while ((txp++)->flags & XEN_NETTXF_more_data);
        return frags;