1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index b8100298017b..e1d6dbb4b770 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -492,7 +492,7 @@ check_frags:
                                  * the header's copy failed, and they are
                                  * sharing a slot, send an error
                                  */
-                                if (i == 0 && sharedslot)
+                                if (i == 0 && !first_shinfo && sharedslot)
                                         xenvif_idx_release(queue, pending_idx,
                                                            XEN_NETIF_RSP_ERROR);
                                 else
@@ -1333,7 +1333,15 @@ int xenvif_tx_action(struct xenvif_queue *queue, int budget)
                                       NULL,
                                       queue->pages_to_map,
                                       nr_mops);
-                BUG_ON(ret);
+                if (ret) {
+                        unsigned int i;
+
+                        netdev_err(queue->vif->dev, "Map fail: nr %u ret %d\n",
+                                   nr_mops, ret);
+                        for (i = 0; i < nr_mops; ++i)
+                                WARN_ON_ONCE(queue->tx_map_ops[i].status ==
+                                             GNTST_okay);
+                }
         }
 
         work_done = xenvif_tx_submit(queue);