From 24524c00e448d7e7dbe5019028f301b941218b27 Mon Sep 17 00:00:00 2001 From: Eli Cohen Date: Fri, 22 Sep 2006 15:22:58 -0700 Subject: [PATCH] --- yaml --- r: 34343 b: refs/heads/master c: a8bfca024326560d86c6323b0504288ca55a75fc h: refs/heads/master i: 34341: f2fb89bffa8526a5d462cdfd96a9a01dff81e9ae 34339: 5652851eb1230fbb9cff6310730368a3c0777c6c 34335: aad62806ea0a102b4e9ad63a91fd3164dfa0435b v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/ulp/ipoib/ipoib_ib.c | 2 +- trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9ca8aaf29f13..12a18a6f3ac8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 507c33504686e733a14ef0b2dc9db0c20fae4653 +refs/heads/master: a8bfca024326560d86c6323b0504288ca55a75fc diff --git a/trunk/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/trunk/drivers/infiniband/ulp/ipoib/ipoib_ib.c index 240befdf90dc..f426a69d9a43 100644 --- a/trunk/drivers/infiniband/ulp/ipoib/ipoib_ib.c +++ b/trunk/drivers/infiniband/ulp/ipoib/ipoib_ib.c @@ -332,7 +332,7 @@ void ipoib_send(struct net_device *dev, struct sk_buff *skb, struct ipoib_tx_buf *tx_req; dma_addr_t addr; - if (skb->len > dev->mtu + INFINIBAND_ALEN) { + if (unlikely(skb->len > dev->mtu + INFINIBAND_ALEN)) { ipoib_warn(priv, "packet len %d (> %d) too long to send, dropping\n", skb->len, dev->mtu + INFINIBAND_ALEN); ++priv->stats.tx_dropped; diff --git a/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c b/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c index 867d62742054..1eaf00e9862c 100644 --- a/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c @@ -620,7 +620,7 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev) struct ipoib_neigh *neigh; unsigned long flags; - if (!spin_trylock_irqsave(&priv->tx_lock, flags)) + if (unlikely(!spin_trylock_irqsave(&priv->tx_lock, flags))) return NETDEV_TX_LOCKED; /* @@ -633,7 +633,7 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev) return NETDEV_TX_BUSY; } - if (skb->dst && skb->dst->neighbour) { + if (likely(skb->dst && skb->dst->neighbour)) { if (unlikely(!*to_ipoib_neigh(skb->dst->neighbour))) { ipoib_path_lookup(skb, dev); goto out;