linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / ieee1394 / ieee1394_transactions.c

diff --git a/drivers/ieee1394/ieee1394_transactions.c b/drivers/ieee1394/ieee1394_transactions.c
index a114b91..3fe2f6c 100644 (file)
--- a/drivers/ieee1394/ieee1394_transactions.c
+++ b/drivers/ieee1394/ieee1394_transactions.c
@@ -136,11 +136,8 @@ int hpsb_get_tlabel(struct hpsb_packet *packet)
 {
        unsigned long flags;
        struct hpsb_tlabel_pool *tp;
-       int n = NODEID_TO_NODE(packet->node_id);
 
-       if (unlikely(n == ALL_NODES))
-               return 0;
-       tp = &packet->host->tpool[n];
+       tp = &packet->host->tpool[packet->node_id & NODE_MASK];
 
        if (irqs_disabled() || in_atomic()) {
                if (down_trylock(&tp->count))
@@ -178,11 +175,8 @@ void hpsb_free_tlabel(struct hpsb_packet *packet)
 {
        unsigned long flags;
        struct hpsb_tlabel_pool *tp;
-       int n = NODEID_TO_NODE(packet->node_id);
 
-       if (unlikely(n == ALL_NODES))
-               return;
-       tp = &packet->host->tpool[n];
+       tp = &packet->host->tpool[packet->node_id & NODE_MASK];
 
        BUG_ON(packet->tlabel > 63 || packet->tlabel < 0);