UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[NET] NETROM: Fix whitespace errors. 

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
YOSHIFUJI Hideaki 2007-02-09 23:25:09 +09:00 committed by David S. Miller
parent 746fac4dcd
commit 5f8f59d664
5 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
net/netrom/af_netrom.c
View File

@ -110,7 +110,7 @@ static int nr_device_event(struct notifier_block *this, unsigned long event, voi
nr_kill_by_device(dev); nr_kill_by_device(dev);
nr_rt_device_down(dev); nr_rt_device_down(dev);
return NOTIFY_DONE; return NOTIFY_DONE;
} }
@ -137,7 +137,7 @@ static struct sock *nr_find_listener(ax25_address *addr)
sk_for_each(s, node, &nr_list) sk_for_each(s, node, &nr_list)
if (!ax25cmp(&nr_sk(s)->source_addr, addr) && if (!ax25cmp(&nr_sk(s)->source_addr, addr) &&
s->sk_state == TCP_LISTEN) { s->sk_state == TCP_LISTEN) {
bh_lock_sock(s); bh_lock_sock(s);
goto found; goto found;
} }
s = NULL; s = NULL;
@ -157,7 +157,7 @@ static struct sock *nr_find_socket(unsigned char index, unsigned char id)
spin_lock_bh(&nr_list_lock); spin_lock_bh(&nr_list_lock);
sk_for_each(s, node, &nr_list) { sk_for_each(s, node, &nr_list) {
struct nr_sock *nr = nr_sk(s); struct nr_sock *nr = nr_sk(s);
if (nr->my_index == index && nr->my_id == id) { if (nr->my_index == index && nr->my_id == id) {
bh_lock_sock(s); bh_lock_sock(s);
goto found; goto found;
@ -181,10 +181,10 @@ static struct sock *nr_find_peer(unsigned char index, unsigned char id,
spin_lock_bh(&nr_list_lock); spin_lock_bh(&nr_list_lock);
sk_for_each(s, node, &nr_list) { sk_for_each(s, node, &nr_list) {
struct nr_sock *nr = nr_sk(s); struct nr_sock *nr = nr_sk(s);
if (nr->your_index == index && nr->your_id == id && if (nr->your_index == index && nr->your_id == id &&
!ax25cmp(&nr->dest_addr, dest)) { !ax25cmp(&nr->dest_addr, dest)) {
bh_lock_sock(s); bh_lock_sock(s);
goto found; goto found;
} }
} }
@ -341,17 +341,17 @@ static int nr_getsockopt(struct socket *sock, int level, int optname,
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct nr_sock *nr = nr_sk(sk); struct nr_sock *nr = nr_sk(sk);
int val = 0; int val = 0;
int len; int len;
if (level != SOL_NETROM) if (level != SOL_NETROM)
return -ENOPROTOOPT; return -ENOPROTOOPT;
if (get_user(len, optlen)) if (get_user(len, optlen))
return -EFAULT; return -EFAULT;
if (len < 0) if (len < 0)
return -EINVAL; return -EINVAL;
switch (optname) { switch (optname) {
case NETROM_T1: case NETROM_T1:
val = nr->t1 / HZ; val = nr->t1 / HZ;
@ -537,7 +537,7 @@ static int nr_release(struct socket *sock)
break; break;
} }
sock->sk = NULL; sock->sk = NULL;
release_sock(sk); release_sock(sk);
sock_put(sk); sock_put(sk);
@ -644,7 +644,7 @@ static int nr_connect(struct socket *sock, struct sockaddr *uaddr,
return -EISCONN; /* No reconnect on a seqpacket socket */ return -EISCONN; /* No reconnect on a seqpacket socket */
} }
sk->sk_state = TCP_CLOSE; sk->sk_state = TCP_CLOSE;
sock->state = SS_UNCONNECTED; sock->state = SS_UNCONNECTED;
if (addr_len != sizeof(struct sockaddr_ax25) && addr_len != sizeof(struct full_sockaddr_ax25)) { if (addr_len != sizeof(struct sockaddr_ax25) && addr_len != sizeof(struct full_sockaddr_ax25)) {
@ -710,7 +710,7 @@ static int nr_connect(struct socket *sock, struct sockaddr *uaddr,
release_sock(sk); release_sock(sk);
return -EINPROGRESS; return -EINPROGRESS;
} }
/* /*
* A Connect Ack with Choke or timeout or failed routing will go to * A Connect Ack with Choke or timeout or failed routing will go to
* closed. * closed.
@ -848,7 +848,7 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr,
int nr_rx_frame(struct sk_buff *skb, struct net_device *dev) int nr_rx_frame(struct sk_buff *skb, struct net_device *dev)
{ {
struct sock *sk; struct sock *sk;
struct sock *make; struct sock *make;
struct nr_sock *nr_make; struct nr_sock *nr_make;
ax25_address *src, *dest, *user; ax25_address *src, *dest, *user;
unsigned short circuit_index, circuit_id; unsigned short circuit_index, circuit_id;
@ -1258,10 +1258,10 @@ static void *nr_info_next(struct seq_file *seq, void *v, loff_t *pos)
{ {
++*pos; ++*pos;
return (v == SEQ_START_TOKEN) ? sk_head(&nr_list) return (v == SEQ_START_TOKEN) ? sk_head(&nr_list)
: sk_next((struct sock *)v); : sk_next((struct sock *)v);
} }
static void nr_info_stop(struct seq_file *seq, void *v) static void nr_info_stop(struct seq_file *seq, void *v)
{ {
spin_unlock_bh(&nr_list_lock); spin_unlock_bh(&nr_list_lock);
@ -1291,7 +1291,7 @@ static int nr_info_show(struct seq_file *seq, void *v)
seq_printf(seq, "%-9s ", ax2asc(buf, &nr->user_addr)); seq_printf(seq, "%-9s ", ax2asc(buf, &nr->user_addr));
seq_printf(seq, "%-9s ", ax2asc(buf, &nr->dest_addr)); seq_printf(seq, "%-9s ", ax2asc(buf, &nr->dest_addr));
seq_printf(seq, seq_printf(seq,
"%-9s %-3s %02X/%02X %02X/%02X %2d %3d %3d %3d %3lu/%03lu %2lu/%02lu %3lu/%03lu %3lu/%03lu %2d/%02d %3d %5d %5d %ld\n", "%-9s %-3s %02X/%02X %02X/%02X %2d %3d %3d %3d %3lu/%03lu %2lu/%02lu %3lu/%03lu %3lu/%03lu %2d/%02d %3d %5d %5d %ld\n",
ax2asc(buf, &nr->source_addr), ax2asc(buf, &nr->source_addr),
devname, devname,
@ -1329,12 +1329,12 @@ static struct seq_operations nr_info_seqops = {
.stop = nr_info_stop, .stop = nr_info_stop,
.show = nr_info_show, .show = nr_info_show,
}; };
static int nr_info_open(struct inode *inode, struct file *file) static int nr_info_open(struct inode *inode, struct file *file)
{ {
return seq_open(file, &nr_info_seqops); return seq_open(file, &nr_info_seqops);
} }
static struct file_operations nr_info_fops = { static struct file_operations nr_info_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = nr_info_open, .open = nr_info_open,
@ -1415,7 +1415,7 @@ static int __init nr_proto_init(void)
printk(KERN_ERR "NET/ROM: nr_proto_init - unable to allocate device structure\n"); printk(KERN_ERR "NET/ROM: nr_proto_init - unable to allocate device structure\n");
goto fail; goto fail;
} }
dev->base_addr = i; dev->base_addr = i;
if (register_netdev(dev)) { if (register_netdev(dev)) {
printk(KERN_ERR "NET/ROM: nr_proto_init - unable to register network device\n"); printk(KERN_ERR "NET/ROM: nr_proto_init - unable to register network device\n");
@ -1430,7 +1430,7 @@ static int __init nr_proto_init(void)
printk(KERN_ERR "NET/ROM: nr_proto_init - unable to register socket family\n"); printk(KERN_ERR "NET/ROM: nr_proto_init - unable to register socket family\n");
goto fail; goto fail;
} }
register_netdevice_notifier(&nr_dev_notifier); register_netdevice_notifier(&nr_dev_notifier);
ax25_register_pid(&nr_pid); ax25_register_pid(&nr_pid);

18
net/netrom/nr_route.c
View File

@ -781,8 +781,8 @@ int nr_route_frame(struct sk_buff *skb, ax25_cb *ax25)
if (ax25 != NULL) { if (ax25 != NULL) {
ret = nr_add_node(nr_src, "", &ax25->dest_addr, ax25->digipeat, ret = nr_add_node(nr_src, "", &ax25->dest_addr, ax25->digipeat,
ax25->ax25_dev->dev, 0, ax25->ax25_dev->dev, 0,
sysctl_netrom_obsolescence_count_initialiser); sysctl_netrom_obsolescence_count_initialiser);
if (ret) if (ret)
return ret; return ret;
} }
@ -861,8 +861,8 @@ static void *nr_node_start(struct seq_file *seq, loff_t *pos)
struct nr_node *nr_node; struct nr_node *nr_node;
struct hlist_node *node; struct hlist_node *node;
int i = 1; int i = 1;
spin_lock_bh(&nr_node_list_lock); spin_lock_bh(&nr_node_list_lock);
if (*pos == 0) if (*pos == 0)
return SEQ_START_TOKEN; return SEQ_START_TOKEN;
@ -879,8 +879,8 @@ static void *nr_node_next(struct seq_file *seq, void *v, loff_t *pos)
{ {
struct hlist_node *node; struct hlist_node *node;
++*pos; ++*pos;
node = (v == SEQ_START_TOKEN) node = (v == SEQ_START_TOKEN)
? nr_node_list.first ? nr_node_list.first
: ((struct nr_node *)v)->node_node.next; : ((struct nr_node *)v)->node_node.next;
@ -963,8 +963,8 @@ static void *nr_neigh_next(struct seq_file *seq, void *v, loff_t *pos)
{ {
struct hlist_node *node; struct hlist_node *node;
++*pos; ++*pos;
node = (v == SEQ_START_TOKEN) node = (v == SEQ_START_TOKEN)
? nr_neigh_list.first ? nr_neigh_list.first
: ((struct nr_neigh *)v)->neigh_node.next; : ((struct nr_neigh *)v)->neigh_node.next;
@ -997,7 +997,7 @@ static int nr_neigh_show(struct seq_file *seq, void *v)
if (nr_neigh->digipeat != NULL) { if (nr_neigh->digipeat != NULL) {
for (i = 0; i < nr_neigh->digipeat->ndigi; i++) for (i = 0; i < nr_neigh->digipeat->ndigi; i++)
seq_printf(seq, " %s", seq_printf(seq, " %s",
ax2asc(buf, &nr_neigh->digipeat->calls[i])); ax2asc(buf, &nr_neigh->digipeat->calls[i]));
} }

2
net/netrom/nr_subr.c
View File

@ -57,7 +57,7 @@ void nr_frames_acked(struct sock *sk, unsigned short nr)
*/ */
if (nrom->va != nr) { if (nrom->va != nr) {
while (skb_peek(&nrom->ack_queue) != NULL && nrom->va != nr) { while (skb_peek(&nrom->ack_queue) != NULL && nrom->va != nr) {
skb = skb_dequeue(&nrom->ack_queue); skb = skb_dequeue(&nrom->ack_queue);
kfree_skb(skb); kfree_skb(skb);
nrom->va = (nrom->va + 1) % NR_MODULUS; nrom->va = (nrom->va + 1) % NR_MODULUS;
} }

2
net/netrom/nr_timer.c
View File

@ -43,7 +43,7 @@ void nr_init_timers(struct sock *sk)
init_timer(&nr->t1timer); init_timer(&nr->t1timer);
nr->t1timer.data = (unsigned long)sk; nr->t1timer.data = (unsigned long)sk;
nr->t1timer.function = &nr_t1timer_expiry; nr->t1timer.function = &nr_t1timer_expiry;
init_timer(&nr->t2timer); init_timer(&nr->t2timer);
nr->t2timer.data = (unsigned long)sk; nr->t2timer.data = (unsigned long)sk;
nr->t2timer.function = &nr_t2timer_expiry; nr->t2timer.function = &nr_t2timer_expiry;

26
net/netrom/sysctl_net_netrom.c
View File

@ -35,7 +35,7 @@ static int min_reset[] = {0}, max_reset[] = {1};
static struct ctl_table_header *nr_table_header; static struct ctl_table_header *nr_table_header;
static ctl_table nr_table[] = { static ctl_table nr_table[] = {
{ {
.ctl_name = NET_NETROM_DEFAULT_PATH_QUALITY, .ctl_name = NET_NETROM_DEFAULT_PATH_QUALITY,
.procname = "default_path_quality", .procname = "default_path_quality",
.data = &sysctl_netrom_default_path_quality, .data = &sysctl_netrom_default_path_quality,
@ -46,18 +46,18 @@ static ctl_table nr_table[] = {
.extra1 = &min_quality, .extra1 = &min_quality,
.extra2 = &max_quality .extra2 = &max_quality
}, },
{ {
.ctl_name = NET_NETROM_OBSOLESCENCE_COUNT_INITIALISER, .ctl_name = NET_NETROM_OBSOLESCENCE_COUNT_INITIALISER,
.procname = "obsolescence_count_initialiser", .procname = "obsolescence_count_initialiser",
.data = &sysctl_netrom_obsolescence_count_initialiser, .data = &sysctl_netrom_obsolescence_count_initialiser,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = &proc_dointvec_minmax,
.strategy = &sysctl_intvec, .strategy = &sysctl_intvec,
.extra1 = &min_obs, .extra1 = &min_obs,
.extra2 = &max_obs .extra2 = &max_obs
}, },
{ {
.ctl_name = NET_NETROM_NETWORK_TTL_INITIALISER, .ctl_name = NET_NETROM_NETWORK_TTL_INITIALISER,
.procname = "network_ttl_initialiser", .procname = "network_ttl_initialiser",
.data = &sysctl_netrom_network_ttl_initialiser, .data = &sysctl_netrom_network_ttl_initialiser,
@ -68,7 +68,7 @@ static ctl_table nr_table[] = {
.extra1 = &min_ttl, .extra1 = &min_ttl,
.extra2 = &max_ttl .extra2 = &max_ttl
}, },
{ {
.ctl_name = NET_NETROM_TRANSPORT_TIMEOUT, .ctl_name = NET_NETROM_TRANSPORT_TIMEOUT,
.procname = "transport_timeout", .procname = "transport_timeout",
.data = &sysctl_netrom_transport_timeout, .data = &sysctl_netrom_transport_timeout,
@ -79,7 +79,7 @@ static ctl_table nr_table[] = {
.extra1 = &min_t1, .extra1 = &min_t1,
.extra2 = &max_t1 .extra2 = &max_t1
}, },
{ {
.ctl_name = NET_NETROM_TRANSPORT_MAXIMUM_TRIES, .ctl_name = NET_NETROM_TRANSPORT_MAXIMUM_TRIES,
.procname = "transport_maximum_tries", .procname = "transport_maximum_tries",
.data = &sysctl_netrom_transport_maximum_tries, .data = &sysctl_netrom_transport_maximum_tries,
@ -90,7 +90,7 @@ static ctl_table nr_table[] = {
.extra1 = &min_n2, .extra1 = &min_n2,
.extra2 = &max_n2 .extra2 = &max_n2
}, },
{ {
.ctl_name = NET_NETROM_TRANSPORT_ACKNOWLEDGE_DELAY, .ctl_name = NET_NETROM_TRANSPORT_ACKNOWLEDGE_DELAY,
.procname = "transport_acknowledge_delay", .procname = "transport_acknowledge_delay",
.data = &sysctl_netrom_transport_acknowledge_delay, .data = &sysctl_netrom_transport_acknowledge_delay,
@ -101,7 +101,7 @@ static ctl_table nr_table[] = {
.extra1 = &min_t2, .extra1 = &min_t2,
.extra2 = &max_t2 .extra2 = &max_t2
}, },
{ {
.ctl_name = NET_NETROM_TRANSPORT_BUSY_DELAY, .ctl_name = NET_NETROM_TRANSPORT_BUSY_DELAY,
.procname = "transport_busy_delay", .procname = "transport_busy_delay",
.data = &sysctl_netrom_transport_busy_delay, .data = &sysctl_netrom_transport_busy_delay,
@ -112,7 +112,7 @@ static ctl_table nr_table[] = {
.extra1 = &min_t4, .extra1 = &min_t4,
.extra2 = &max_t4 .extra2 = &max_t4
}, },
{ {
.ctl_name = NET_NETROM_TRANSPORT_REQUESTED_WINDOW_SIZE, .ctl_name = NET_NETROM_TRANSPORT_REQUESTED_WINDOW_SIZE,
.procname = "transport_requested_window_size", .procname = "transport_requested_window_size",
.data = &sysctl_netrom_transport_requested_window_size, .data = &sysctl_netrom_transport_requested_window_size,
@ -123,7 +123,7 @@ static ctl_table nr_table[] = {
.extra1 = &min_window, .extra1 = &min_window,
.extra2 = &max_window .extra2 = &max_window
}, },
{ {
.ctl_name = NET_NETROM_TRANSPORT_NO_ACTIVITY_TIMEOUT, .ctl_name = NET_NETROM_TRANSPORT_NO_ACTIVITY_TIMEOUT,
.procname = "transport_no_activity_timeout", .procname = "transport_no_activity_timeout",
.data = &sysctl_netrom_transport_no_activity_timeout, .data = &sysctl_netrom_transport_no_activity_timeout,
@ -134,7 +134,7 @@ static ctl_table nr_table[] = {
.extra1 = &min_idle, .extra1 = &min_idle,
.extra2 = &max_idle .extra2 = &max_idle
}, },
{ {
.ctl_name = NET_NETROM_ROUTING_CONTROL, .ctl_name = NET_NETROM_ROUTING_CONTROL,
.procname = "routing_control", .procname = "routing_control",
.data = &sysctl_netrom_routing_control, .data = &sysctl_netrom_routing_control,
@ -145,7 +145,7 @@ static ctl_table nr_table[] = {
.extra1 = &min_route, .extra1 = &min_route,
.extra2 = &max_route .extra2 = &max_route
}, },
{ {
.ctl_name = NET_NETROM_LINK_FAILS_COUNT, .ctl_name = NET_NETROM_LINK_FAILS_COUNT,
.procname = "link_fails_count", .procname = "link_fails_count",
.data = &sysctl_netrom_link_fails_count, .data = &sysctl_netrom_link_fails_count,
@ -156,7 +156,7 @@ static ctl_table nr_table[] = {
.extra1 = &min_fails, .extra1 = &min_fails,
.extra2 = &max_fails .extra2 = &max_fails
}, },
{ {
.ctl_name = NET_NETROM_RESET, .ctl_name = NET_NETROM_RESET,
.procname = "reset", .procname = "reset",
.data = &sysctl_netrom_reset_circuit, .data = &sysctl_netrom_reset_circuit,