X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fieee1394%2Fieee1394_transactions.c;h=3fe2f6c4a2539611bd24c0fece9bd69b6f6e5ce1;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=a114b91d606db640ce5ffa46acc13abef2ebe6a2;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git diff --git a/drivers/ieee1394/ieee1394_transactions.c b/drivers/ieee1394/ieee1394_transactions.c index a114b91d6..3fe2f6c4a 100644 --- 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);