Commit 254addf4 authored by David S. Miller's avatar David S. Miller

Merge master.kernel.org:/home/acme/BK/llc-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5
parents a87706c2 102f0733
...@@ -198,5 +198,19 @@ extern void aarp_cleanup_module(void); ...@@ -198,5 +198,19 @@ extern void aarp_cleanup_module(void);
#define at_sk(__sk) ((struct atalk_sock *)(__sk)->protinfo) #define at_sk(__sk) ((struct atalk_sock *)(__sk)->protinfo)
extern struct sock *atalk_sockets;
extern spinlock_t atalk_sockets_lock;
extern struct atalk_route *atalk_routes;
extern rwlock_t atalk_routes_lock;
extern struct atalk_iface *atalk_interfaces;
extern spinlock_t atalk_interfaces_lock;
extern struct atalk_route atrtr_default;
extern int atalk_proc_init(void);
extern void atalk_proc_exit(void);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __LINUX_ATALK_H__ */ #endif /* __LINUX_ATALK_H__ */
...@@ -6,7 +6,7 @@ export-objs = ddp.o ...@@ -6,7 +6,7 @@ export-objs = ddp.o
obj-$(CONFIG_ATALK) += appletalk.o obj-$(CONFIG_ATALK) += appletalk.o
appletalk-y := aarp.o ddp.o appletalk-y := aarp.o ddp.o atalk_proc.o
appletalk-$(CONFIG_SYSCTL) += sysctl_net_atalk.o appletalk-$(CONFIG_SYSCTL) += sysctl_net_atalk.o
appletalk-objs := $(appletalk-y) appletalk-objs := $(appletalk-y)
......
...@@ -30,34 +30,13 @@ ...@@ -30,34 +30,13 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <asm/bitops.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/socket.h>
#include <linux/sockios.h>
#include <linux/in.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
#include <linux/if_ether.h>
#include <linux/inet.h>
#include <linux/notifier.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/skbuff.h>
#include <linux/spinlock.h>
#include <net/sock.h> #include <net/sock.h>
#include <net/datalink.h> #include <net/datalink.h>
#include <net/psnap.h> #include <net/psnap.h>
#include <linux/atalk.h> #include <linux/atalk.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/module.h>
int sysctl_aarp_expiry_time = AARP_EXPIRY_TIME; int sysctl_aarp_expiry_time = AARP_EXPIRY_TIME;
int sysctl_aarp_tick_time = AARP_TICK_TIME; int sysctl_aarp_tick_time = AARP_TICK_TIME;
...@@ -995,4 +974,3 @@ void aarp_unregister_proc_fs(void) ...@@ -995,4 +974,3 @@ void aarp_unregister_proc_fs(void)
proc_net_remove("aarp"); proc_net_remove("aarp");
} }
#endif #endif
MODULE_LICENSE("GPL");
/*
* atalk_proc.c - proc support for Appletalk
*
* Copyright(c) Arnaldo Carvalho de Melo <acme@conectiva.com.br>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation, version 2.
*/
#include <linux/config.h>
#include <linux/init.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <net/sock.h>
#include <linux/atalk.h>
#ifdef CONFIG_PROC_FS
static __inline__ struct atalk_iface *atalk_get_interface_idx(loff_t pos)
{
struct atalk_iface *i;
for (i = atalk_interfaces; pos && i; i = i->next)
--pos;
return i;
}
static void *atalk_seq_interface_start(struct seq_file *seq, loff_t *pos)
{
loff_t l = *pos;
spin_lock_bh(&atalk_interfaces_lock);
return l ? atalk_get_interface_idx(--l) : (void *)1;
}
static void *atalk_seq_interface_next(struct seq_file *seq, void *v, loff_t *pos)
{
struct atalk_iface *i;
++*pos;
if (v == (void *)1) {
i = NULL;
if (atalk_interfaces)
i = atalk_interfaces;
goto out;
}
i = v;
i = i->next;
out:
return i;
}
static void atalk_seq_interface_stop(struct seq_file *seq, void *v)
{
spin_unlock_bh(&atalk_interfaces_lock);
}
static int atalk_seq_interface_show(struct seq_file *seq, void *v)
{
struct atalk_iface *iface;
if (v == (void *)1) {
seq_puts(seq, "Interface Address Networks "
"Status\n");
goto out;
}
iface = v;
seq_printf(seq, "%-16s %04X:%02X %04X-%04X %d\n",
iface->dev->name, ntohs(iface->address.s_net),
iface->address.s_node, ntohs(iface->nets.nr_firstnet),
ntohs(iface->nets.nr_lastnet), iface->status);
out:
return 0;
}
static __inline__ struct atalk_route *atalk_get_route_idx(loff_t pos)
{
struct atalk_route *r;
for (r = atalk_routes; pos && r; r = r->next)
--pos;
return r;
}
static void *atalk_seq_route_start(struct seq_file *seq, loff_t *pos)
{
loff_t l = *pos;
read_lock_bh(&atalk_routes_lock);
return l ? atalk_get_route_idx(--l) : (void *)1;
}
static void *atalk_seq_route_next(struct seq_file *seq, void *v, loff_t *pos)
{
struct atalk_route *r;
++*pos;
if (v == (void *)1) {
r = NULL;
if (atalk_routes)
r = atalk_routes;
goto out;
}
r = v;
r = r->next;
out:
return r;
}
static void atalk_seq_route_stop(struct seq_file *seq, void *v)
{
read_unlock_bh(&atalk_routes_lock);
}
static int atalk_seq_route_show(struct seq_file *seq, void *v)
{
struct atalk_route *rt;
if (v == (void *)1) {
seq_puts(seq, "Target Router Flags Dev\n");
goto out;
}
if (atrtr_default.dev) {
rt = &atrtr_default;
seq_printf(seq, "Default %04X:%02X %-4d %s\n",
ntohs(rt->gateway.s_net), rt->gateway.s_node,
rt->flags, rt->dev->name);
}
rt = v;
seq_printf(seq, "%04X:%02X %04X:%02X %-4d %s\n",
ntohs(rt->target.s_net), rt->target.s_node,
ntohs(rt->gateway.s_net), rt->gateway.s_node,
rt->flags, rt->dev->name);
out:
return 0;
}
static __inline__ struct sock *atalk_get_socket_idx(loff_t pos)
{
struct sock *s;
for (s = atalk_sockets; pos && s; s = s->next)
--pos;
return s;
}
static void *atalk_seq_socket_start(struct seq_file *seq, loff_t *pos)
{
loff_t l = *pos;
spin_lock_bh(&atalk_sockets_lock);
return l ? atalk_get_socket_idx(--l) : (void *)1;
}
static void *atalk_seq_socket_next(struct seq_file *seq, void *v, loff_t *pos)
{
struct sock *i;
++*pos;
if (v == (void *)1) {
i = NULL;
if (atalk_sockets)
i = atalk_sockets;
goto out;
}
i = v;
i = i->next;
out:
return i;
}
static void atalk_seq_socket_stop(struct seq_file *seq, void *v)
{
spin_unlock_bh(&atalk_sockets_lock);
}
static int atalk_seq_socket_show(struct seq_file *seq, void *v)
{
struct sock *s;
struct atalk_sock *at;
if (v == (void *)1) {
seq_printf(seq, "Type Local_addr Remote_addr Tx_queue "
"Rx_queue St UID\n");
goto out;
}
s = v;
at = at_sk(s);
seq_printf(seq, "%02X %04X:%02X:%02X %04X:%02X:%02X %08X:%08X "
"%02X %d\n",
s->type, ntohs(at->src_net), at->src_node, at->src_port,
ntohs(at->dest_net), at->dest_node, at->dest_port,
atomic_read(&s->wmem_alloc), atomic_read(&s->rmem_alloc),
s->state, SOCK_INODE(s->socket)->i_uid);
out:
return 0;
}
struct seq_operations atalk_seq_interface_ops = {
.start = atalk_seq_interface_start,
.next = atalk_seq_interface_next,
.stop = atalk_seq_interface_stop,
.show = atalk_seq_interface_show,
};
struct seq_operations atalk_seq_route_ops = {
.start = atalk_seq_route_start,
.next = atalk_seq_route_next,
.stop = atalk_seq_route_stop,
.show = atalk_seq_route_show,
};
struct seq_operations atalk_seq_socket_ops = {
.start = atalk_seq_socket_start,
.next = atalk_seq_socket_next,
.stop = atalk_seq_socket_stop,
.show = atalk_seq_socket_show,
};
static int atalk_seq_interface_open(struct inode *inode, struct file *file)
{
return seq_open(file, &atalk_seq_interface_ops);
}
static int atalk_seq_route_open(struct inode *inode, struct file *file)
{
return seq_open(file, &atalk_seq_route_ops);
}
static int atalk_seq_socket_open(struct inode *inode, struct file *file)
{
return seq_open(file, &atalk_seq_socket_ops);
}
static struct file_operations atalk_seq_interface_fops = {
.open = atalk_seq_interface_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
static struct file_operations atalk_seq_route_fops = {
.open = atalk_seq_route_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
static struct file_operations atalk_seq_socket_fops = {
.open = atalk_seq_socket_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
static struct proc_dir_entry *atalk_proc_dir;
int __init atalk_proc_init(void)
{
struct proc_dir_entry *p;
int rc = -ENOMEM;
atalk_proc_dir = proc_mkdir("atalk", proc_net);
if (!atalk_proc_dir)
goto out;
p = create_proc_entry("interface", S_IRUGO, atalk_proc_dir);
if (!p)
goto out_interface;
p->proc_fops = &atalk_seq_interface_fops;
p = create_proc_entry("route", S_IRUGO, atalk_proc_dir);
if (!p)
goto out_route;
p->proc_fops = &atalk_seq_route_fops;
p = create_proc_entry("socket", S_IRUGO, atalk_proc_dir);
if (!p)
goto out_socket;
p->proc_fops = &atalk_seq_socket_fops;
rc = 0;
out:
return rc;
out_socket:
remove_proc_entry("route", atalk_proc_dir);
out_route:
remove_proc_entry("interface", atalk_proc_dir);
out_interface:
remove_proc_entry("atalk", proc_net);
goto out;
}
void __exit atalk_proc_exit(void)
{
remove_proc_entry("interface", atalk_proc_dir);
remove_proc_entry("route", atalk_proc_dir);
remove_proc_entry("socket", atalk_proc_dir);
remove_proc_entry("atalk", proc_net);
}
#else /* CONFIG_PROC_FS */
int __init atalk_proc_init(void)
{
return 0;
}
void __exit atalk_proc_exit(void)
{
}
#endif /* CONFIG_PROC_FS */
This diff is collapsed.
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/mm.h>
#include <linux/sysctl.h> #include <linux/sysctl.h>
extern int sysctl_aarp_expiry_time; extern int sysctl_aarp_expiry_time;
...@@ -16,7 +15,7 @@ extern int sysctl_aarp_retransmit_limit; ...@@ -16,7 +15,7 @@ extern int sysctl_aarp_retransmit_limit;
extern int sysctl_aarp_resolve_time; extern int sysctl_aarp_resolve_time;
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
static ctl_table atalk_table[] = { static struct ctl_table atalk_table[] = {
{ {
.ctl_name = NET_ATALK_AARP_EXPIRY_TIME, .ctl_name = NET_ATALK_AARP_EXPIRY_TIME,
.procname = "aarp-expiry-time", .procname = "aarp-expiry-time",
...@@ -52,7 +51,7 @@ static ctl_table atalk_table[] = { ...@@ -52,7 +51,7 @@ static ctl_table atalk_table[] = {
{ 0 }, { 0 },
}; };
static ctl_table atalk_dir_table[] = { static struct ctl_table atalk_dir_table[] = {
{ {
.ctl_name = NET_ATALK, .ctl_name = NET_ATALK,
.procname = "appletalk", .procname = "appletalk",
...@@ -62,7 +61,7 @@ static ctl_table atalk_dir_table[] = { ...@@ -62,7 +61,7 @@ static ctl_table atalk_dir_table[] = {
{ 0 }, { 0 },
}; };
static ctl_table atalk_root_table[] = { static struct ctl_table atalk_root_table[] = {
{ {
.ctl_name = CTL_NET, .ctl_name = CTL_NET,
.procname = "net", .procname = "net",
......
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