Commit e192426f authored by David S. Miller's avatar David S. Miller

Merge kernel.bkbits.net:/home/acme/net-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5
parents 3c498e87 0f9045ad
...@@ -91,12 +91,15 @@ static int snap_request(struct datalink_proto *dl, ...@@ -91,12 +91,15 @@ static int snap_request(struct datalink_proto *dl,
EXPORT_SYMBOL(register_snap_client); EXPORT_SYMBOL(register_snap_client);
EXPORT_SYMBOL(unregister_snap_client); EXPORT_SYMBOL(unregister_snap_client);
static char snap_err_msg[] __initdata =
KERN_CRIT "SNAP - unable to register with 802.2\n";
static int __init snap_init(void) static int __init snap_init(void)
{ {
snap_sap = llc_sap_open(0xAA, snap_rcv); snap_sap = llc_sap_open(0xAA, snap_rcv);
if (!snap_sap) if (!snap_sap)
printk(KERN_CRIT "SNAP - unable to register with 802.2\n"); printk(snap_err_msg);
return 0; return 0;
} }
......
...@@ -13,10 +13,11 @@ ...@@ -13,10 +13,11 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/init.h>
#ifdef CONFIG_PROC_FS
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/init.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <net/sock.h> #include <net/sock.h>
#include <net/llc_c_ac.h> #include <net/llc_c_ac.h>
...@@ -27,14 +28,13 @@ ...@@ -27,14 +28,13 @@
#include <net/llc_main.h> #include <net/llc_main.h>
#include <net/llc_sap.h> #include <net/llc_sap.h>
#ifdef CONFIG_PROC_FS
static void llc_ui_format_mac(struct seq_file *seq, unsigned char *mac) static void llc_ui_format_mac(struct seq_file *seq, unsigned char *mac)
{ {
seq_printf(seq, "%02X:%02X:%02X:%02X:%02X:%02X", seq_printf(seq, "%02X:%02X:%02X:%02X:%02X:%02X",
mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
} }
static __inline__ struct sock *llc_get_sk_idx(loff_t pos) static struct sock *llc_get_sk_idx(loff_t pos)
{ {
struct list_head *sap_entry; struct list_head *sap_entry;
struct llc_sap *sap; struct llc_sap *sap;
...@@ -44,15 +44,15 @@ static __inline__ struct sock *llc_get_sk_idx(loff_t pos) ...@@ -44,15 +44,15 @@ static __inline__ struct sock *llc_get_sk_idx(loff_t pos)
sap = list_entry(sap_entry, struct llc_sap, node); sap = list_entry(sap_entry, struct llc_sap, node);
read_lock_bh(&sap->sk_list.lock); read_lock_bh(&sap->sk_list.lock);
for (sk = sap->sk_list.list; pos && sk; sk = sk->next) for (sk = sap->sk_list.list; sk; sk = sk->next)
--pos; if (!pos--) {
if (!pos) {
if (!sk) if (!sk)
read_unlock_bh(&sap->sk_list.lock); read_unlock_bh(&sap->sk_list.lock);
break; goto out;
} }
read_unlock_bh(&sap->sk_list.lock); read_unlock_bh(&sap->sk_list.lock);
} }
out:
return sk; return sk;
} }
...@@ -72,15 +72,7 @@ static void *llc_seq_next(struct seq_file *seq, void *v, loff_t *pos) ...@@ -72,15 +72,7 @@ static void *llc_seq_next(struct seq_file *seq, void *v, loff_t *pos)
++*pos; ++*pos;
if (v == (void *)1) { if (v == (void *)1) {
if (list_empty(&llc_main_station.sap_list.list)) { sk = llc_get_sk_idx(0);
sk = NULL;
goto out;
}
sap = list_entry(llc_main_station.sap_list.list.next,
struct llc_sap, node);
read_lock_bh(&sap->sk_list.lock);
sk = sap->sk_list.list;
goto out; goto out;
} }
sk = v; sk = v;
...@@ -109,6 +101,13 @@ static void *llc_seq_next(struct seq_file *seq, void *v, loff_t *pos) ...@@ -109,6 +101,13 @@ static void *llc_seq_next(struct seq_file *seq, void *v, loff_t *pos)
static void llc_seq_stop(struct seq_file *seq, void *v) static void llc_seq_stop(struct seq_file *seq, void *v)
{ {
if (v) {
struct sock *sk = v;
struct llc_opt *llc = llc_sk(sk);
struct llc_sap *sap = llc->sap;
read_unlock_bh(&sap->sk_list.lock);
}
read_unlock_bh(&llc_main_station.sap_list.lock); read_unlock_bh(&llc_main_station.sap_list.lock);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment