From 29366d6069e4f075bf2b5f91a3dd75f5e35cc217 Mon Sep 17 00:00:00 2001 From: Bernard Pidoux Date: Fri, 2 May 2008 17:03:22 -0700 Subject: [PATCH] --- yaml --- r: 95913 b: refs/heads/master c: f37f2c62a28e848e06399ea2f9be1e098212625c h: refs/heads/master i: 95911: 11fa1ea5d08e53825d3f9886cc52cb76e54f6906 v: v3 --- [refs] | 2 +- trunk/net/rose/rose_route.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2c52649d7c80..dc8cef71ff63 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ac2ccd01646e08d7176185c94e5b19404a25998 +refs/heads/master: f37f2c62a28e848e06399ea2f9be1e098212625c diff --git a/trunk/net/rose/rose_route.c b/trunk/net/rose/rose_route.c index 5053a53ba24f..bd593871c81e 100644 --- a/trunk/net/rose/rose_route.c +++ b/trunk/net/rose/rose_route.c @@ -1066,12 +1066,12 @@ int rose_route_frame(struct sk_buff *skb, ax25_cb *ax25) #ifdef CONFIG_PROC_FS static void *rose_node_start(struct seq_file *seq, loff_t *pos) - __acquires(rose_neigh_list_lock) + __acquires(rose_node_list_lock) { struct rose_node *rose_node; int i = 1; - spin_lock_bh(&rose_neigh_list_lock); + spin_lock_bh(&rose_node_list_lock); if (*pos == 0) return SEQ_START_TOKEN; @@ -1090,9 +1090,9 @@ static void *rose_node_next(struct seq_file *seq, void *v, loff_t *pos) } static void rose_node_stop(struct seq_file *seq, void *v) - __releases(rose_neigh_list_lock) + __releases(rose_node_list_lock) { - spin_unlock_bh(&rose_neigh_list_lock); + spin_unlock_bh(&rose_node_list_lock); } static int rose_node_show(struct seq_file *seq, void *v)