From 832291c51747bf85eb3134dad4b5719baf24c36d Mon Sep 17 00:00:00 2001
From: Shuah Khan <shuah.khan@hp.com>
Date: Fri, 20 Jul 2012 13:34:32 +0000
Subject: [PATCH] --- yaml --- r: 315809 b: refs/heads/master c:
 9b70749e64132e17ab02239b82fcb4a2c55554d1 h: refs/heads/master i:   315807:
 313cc321afc479b9cfa2f646e350a930f7100eb3 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/ethernet/sun/niu.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a81bf2b2d3a3..2a7c32b12d74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec2deec1f3520c467e3fb64f11a5d1e9c073e376
+refs/heads/master: 9b70749e64132e17ab02239b82fcb4a2c55554d1
diff --git a/trunk/drivers/net/ethernet/sun/niu.c b/trunk/drivers/net/ethernet/sun/niu.c
index 60d5c035d946..c2a0fe393267 100644
--- a/trunk/drivers/net/ethernet/sun/niu.c
+++ b/trunk/drivers/net/ethernet/sun/niu.c
@@ -3517,7 +3517,7 @@ static int niu_rbr_fill(struct niu *np, struct rx_ring_info *rp, gfp_t mask)
 	err = 0;
 	while (index < (rp->rbr_table_size - blocks_per_page)) {
 		err = niu_rbr_add_page(np, rp, mask, index);
-		if (err)
+		if (unlikely(err))
 			break;
 
 		index += blocks_per_page;