[PATCH linux1394-2.6.git 12/15] ieee1394: eth1394: some conditions are unlikely

[Stefan Richter]

Signed-off-by: Stefan Richter <[EMAIL PROTECTED]>
---
 drivers/ieee1394/eth1394.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: linux/drivers/ieee1394/eth1394.c
===================================================================
--- linux.orig/drivers/ieee1394/eth1394.c
+++ linux/drivers/ieee1394/eth1394.c
@@ -1027,7 +1027,7 @@ static int ether1394_data_handler(struct
        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));
@@ -1052,7 +1052,7 @@ static int ether1394_data_handler(struct
                 * 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;
@@ -1207,7 +1207,7 @@ static int ether1394_write(struct hpsb_h
        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;
@@ -1233,7 +1233,7 @@ static void ether1394_iso(struct hpsb_is
        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;

-- 
Stefan Richter
-=====-=-=== -=-- ---=-
http://arcgraph.de/sr/

-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html