Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6

[karo-tx-linux.git] / drivers / block / aoe / aoenet.c

diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c
index 71d3ea8d30062cc85b7edba1e4f8270673f6a829..63773a90581dd36818051a114e38b5b60af0a874 100644 (file)
--- a/drivers/block/aoe/aoenet.c
+++ b/drivers/block/aoe/aoenet.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 Coraid, Inc.  See COPYING for GPL terms. */
+/* Copyright (c) 2013 Coraid, Inc.  See COPYING for GPL terms. */
 /*
  * aoenet.c
  * Ethernet portion of AoE driver
@@ -52,7 +52,7 @@ static struct sk_buff_head skbtxq;
 
 /* enters with txlock held */
 static int
-tx(void) __must_hold(&txlock)
+tx(int id) __must_hold(&txlock)
 {
        struct sk_buff *skb;
        struct net_device *ifp;
@@ -205,7 +205,8 @@ aoenet_init(void)
        kts.lock = &txlock;
        kts.fn = tx;
        kts.waitq = &txwq;
-       kts.name = "aoe_tx";
+       kts.id = 0;
+       snprintf(kts.name, sizeof(kts.name), "aoe_tx%d", kts.id);
        if (aoe_ktstart(&kts))
                return -EAGAIN;
        dev_add_pack(&aoe_pt);