Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

[linux-2.6-microblaze.git] / drivers / net / thunderbolt.c

diff --git a/drivers/net/thunderbolt.c b/drivers/net/thunderbolt.c
index c2e4408..3160443 100644 (file)
--- a/drivers/net/thunderbolt.c
+++ b/drivers/net/thunderbolt.c
@@ -866,8 +866,8 @@ static int tbnet_open(struct net_device *dev)
        eof_mask = BIT(TBIP_PDF_FRAME_END);
 
        ring = tb_ring_alloc_rx(xd->tb->nhi, -1, TBNET_RING_SIZE,
-                               RING_FLAG_FRAME | RING_FLAG_E2E, sof_mask,
-                               eof_mask, tbnet_start_poll, net);
+                               RING_FLAG_FRAME, sof_mask, eof_mask,
+                               tbnet_start_poll, net);
        if (!ring) {
                netdev_err(dev, "failed to allocate Rx ring\n");
                tb_ring_free(net->tx_ring.ring);