---

yaml --- r: 315809 b: refs/heads/master c: 9b70749 h: refs/heads/master i: 315807: 313cc32 v: v3
git-mirror · Jul 23, 2012 · 832291c · 832291c
1 parent 6f9353d
commit 832291c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;