summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Goode <emilgoode@gmail.com>2014-05-09 01:07:17 +0200
committerDavid S. Miller <davem@davemloft.net>2014-05-09 16:34:10 -0400
commita9de0500083c18589ba2ea4543135c1bea8419ec (patch)
tree8cf6f252926cd6f989409df02f35f9675b7ef78c
parentde682941eef3e5f6d1b653a6c214bc8a288f17c1 (diff)
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>
-rw-r--r--drivers/net/ethernet/sun/cassini.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
index df8d383acf48..b9ac20f42651 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)