From: Emil Goode <emilgoode@gmail.com>
Date: Thu, 8 May 2014 23:07:17 +0000 (+0200)
Subject: net: cassini: use nested lock annotation
X-Git-Tag: v4.14-rc1~7493^2~48
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a9de0500083c18589ba2ea4543135c1bea8419ec;p=platform%2Fkernel%2Flinux-rpi.git

net: cassini: use nested lock annotation

In the cas_lock_tx function we acquire multiple locks in a loop and
need to use nested lock annotation to prevent lockdep warnings.

Reported-by: Meelis Roos <mroos@linux.ee>
Signed-off-by: Emil Goode <emilgoode@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
index df8d383..b9ac20f 100644
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -246,7 +246,7 @@ static inline void cas_lock_tx(struct cas *cp)
 	int i;
 
 	for (i = 0; i < N_TX_RINGS; i++)
-		spin_lock(&cp->tx_lock[i]);
+		spin_lock_nested(&cp->tx_lock[i], i);
 }
 
 static inline void cas_lock_all(struct cas *cp)