commit 099398719bb53119734354bc079840bebf1c7386
author Stefan Richter <stefanr@s5r6.in-berlin.de> Mon Apr 02 02:22:21 2007 +0200
committer Stefan Richter <stefanr@s5r6.in-berlin.de> Mon Apr 30 00:00:32 2007 +0200
tree 26272e4fe3f4a7cd94d811f611a94605e2208d67
parent 2e2173df68f419aa41558e1fa90d7263b2d0211f

ieee1394: eth1394: some conditions are unlikely

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

drivers/ieee1394/eth1394.c

diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index 08f63c8..a6c4a37 100644
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -1023,7 +1023,7 @@
 	if (!ud) {
 		struct eth1394_node_ref *node;
 		node = eth1394_find_node_nodeid(&priv->ip_node_list, srcid);
-		if (!node) {
+		if (unlikely(!node)) {
 			HPSB_PRINT(KERN_ERR, "ether1394 rx: sender nodeid "
 				   "lookup failure: " NODE_BUS_FMT,
 				   NODE_BUS_ARGS(priv->host, srcid));
@@ -1048,7 +1048,7 @@
 		 * high level network layer. */
 
 		skb = dev_alloc_skb(len + dev->hard_header_len + 15);
-		if (!skb) {
+		if (unlikely(!skb)) {
 			ETH1394_PRINT_G(KERN_ERR, "Out of memory\n");
 			priv->stats.rx_dropped++;
 			return -1;
@@ -1203,7 +1203,7 @@
 	struct eth1394_host_info *hi;
 
 	hi = hpsb_get_hostinfo(&eth1394_highlevel, host);
-	if (hi == NULL) {
+	if (unlikely(!hi)) {
 		ETH1394_PRINT_G(KERN_ERR, "No net device at fw-host%d\n",
 				host->id);
 		return RCODE_ADDRESS_ERROR;
@@ -1229,7 +1229,7 @@
 	int nready;
 
 	hi = hpsb_get_hostinfo(&eth1394_highlevel, iso->host);
-	if (hi == NULL) {
+	if (unlikely(!hi)) {
 		ETH1394_PRINT_G(KERN_ERR, "No net device at fw-host%d\n",
 				iso->host->id);
 		return;