aboutsummaryrefslogtreecommitdiffstats
path: root/net/rose
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2007-02-09 09:25:12 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-02-11 02:20:04 -0500
commit3dcf7c5e8b92387e0c63b3c75757fee1991f78f8 (patch)
tree59940d6238542830b72c48429ff8471e9c430f73 /net/rose
parent1ce4f28bd761eeb979d29be350f2d22383d4c2f0 (diff)
[NET] ROSE: Fix whitespace errors.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rose')
-rw-r--r--net/rose/af_rose.c12
-rw-r--r--net/rose/rose_route.c36
-rw-r--r--net/rose/sysctl_net_rose.c20
3 files changed, 34 insertions, 34 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 9e279464c9d1..7a81a8ee8544 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -1351,7 +1351,7 @@ static void *rose_info_start(struct seq_file *seq, loff_t *pos)
1351 spin_lock_bh(&rose_list_lock); 1351 spin_lock_bh(&rose_list_lock);
1352 if (*pos == 0) 1352 if (*pos == 0)
1353 return SEQ_START_TOKEN; 1353 return SEQ_START_TOKEN;
1354 1354
1355 i = 1; 1355 i = 1;
1356 sk_for_each(s, node, &rose_list) { 1356 sk_for_each(s, node, &rose_list) {
1357 if (i == *pos) 1357 if (i == *pos)
@@ -1365,10 +1365,10 @@ static void *rose_info_next(struct seq_file *seq, void *v, loff_t *pos)
1365{ 1365{
1366 ++*pos; 1366 ++*pos;
1367 1367
1368 return (v == SEQ_START_TOKEN) ? sk_head(&rose_list) 1368 return (v == SEQ_START_TOKEN) ? sk_head(&rose_list)
1369 : sk_next((struct sock *)v); 1369 : sk_next((struct sock *)v);
1370} 1370}
1371 1371
1372static void rose_info_stop(struct seq_file *seq, void *v) 1372static void rose_info_stop(struct seq_file *seq, void *v)
1373{ 1373{
1374 spin_unlock_bh(&rose_list_lock); 1374 spin_unlock_bh(&rose_list_lock);
@@ -1379,7 +1379,7 @@ static int rose_info_show(struct seq_file *seq, void *v)
1379 char buf[11]; 1379 char buf[11];
1380 1380
1381 if (v == SEQ_START_TOKEN) 1381 if (v == SEQ_START_TOKEN)
1382 seq_puts(seq, 1382 seq_puts(seq,
1383 "dest_addr dest_call src_addr src_call dev lci neigh st vs vr va t t1 t2 t3 hb idle Snd-Q Rcv-Q inode\n"); 1383 "dest_addr dest_call src_addr src_call dev lci neigh st vs vr va t t1 t2 t3 hb idle Snd-Q Rcv-Q inode\n");
1384 1384
1385 else { 1385 else {
@@ -1392,7 +1392,7 @@ static int rose_info_show(struct seq_file *seq, void *v)
1392 devname = "???"; 1392 devname = "???";
1393 else 1393 else
1394 devname = dev->name; 1394 devname = dev->name;
1395 1395
1396 seq_printf(seq, "%-10s %-9s ", 1396 seq_printf(seq, "%-10s %-9s ",
1397 rose2asc(&rose->dest_addr), 1397 rose2asc(&rose->dest_addr),
1398 ax2asc(buf, &rose->dest_call)); 1398 ax2asc(buf, &rose->dest_call));
@@ -1520,7 +1520,7 @@ static int __init rose_proto_init(void)
1520 char name[IFNAMSIZ]; 1520 char name[IFNAMSIZ];
1521 1521
1522 sprintf(name, "rose%d", i); 1522 sprintf(name, "rose%d", i);
1523 dev = alloc_netdev(sizeof(struct net_device_stats), 1523 dev = alloc_netdev(sizeof(struct net_device_stats),
1524 name, rose_setup); 1524 name, rose_setup);
1525 if (!dev) { 1525 if (!dev) {
1526 printk(KERN_ERR "ROSE: rose_proto_init - unable to allocate memory\n"); 1526 printk(KERN_ERR "ROSE: rose_proto_init - unable to allocate memory\n");
diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c
index 8028c0d425dc..0dcca4289eeb 100644
--- a/net/rose/rose_route.c
+++ b/net/rose/rose_route.c
@@ -66,7 +66,7 @@ static int __must_check rose_add_node(struct rose_route_struct *rose_route,
66 while (rose_node != NULL) { 66 while (rose_node != NULL) {
67 if ((rose_node->mask == rose_route->mask) && 67 if ((rose_node->mask == rose_route->mask) &&
68 (rosecmpm(&rose_route->address, &rose_node->address, 68 (rosecmpm(&rose_route->address, &rose_node->address,
69 rose_route->mask) == 0)) 69 rose_route->mask) == 0))
70 break; 70 break;
71 rose_node = rose_node->next; 71 rose_node = rose_node->next;
72 } 72 }
@@ -300,7 +300,7 @@ static int rose_del_node(struct rose_route_struct *rose_route,
300 while (rose_node != NULL) { 300 while (rose_node != NULL) {
301 if ((rose_node->mask == rose_route->mask) && 301 if ((rose_node->mask == rose_route->mask) &&
302 (rosecmpm(&rose_route->address, &rose_node->address, 302 (rosecmpm(&rose_route->address, &rose_node->address,
303 rose_route->mask) == 0)) 303 rose_route->mask) == 0))
304 break; 304 break;
305 rose_node = rose_node->next; 305 rose_node = rose_node->next;
306 } 306 }
@@ -1070,7 +1070,7 @@ static void *rose_node_start(struct seq_file *seq, loff_t *pos)
1070 if (*pos == 0) 1070 if (*pos == 0)
1071 return SEQ_START_TOKEN; 1071 return SEQ_START_TOKEN;
1072 1072
1073 for (rose_node = rose_node_list; rose_node && i < *pos; 1073 for (rose_node = rose_node_list; rose_node && i < *pos;
1074 rose_node = rose_node->next, ++i); 1074 rose_node = rose_node->next, ++i);
1075 1075
1076 return (i == *pos) ? rose_node : NULL; 1076 return (i == *pos) ? rose_node : NULL;
@@ -1079,8 +1079,8 @@ static void *rose_node_start(struct seq_file *seq, loff_t *pos)
1079static void *rose_node_next(struct seq_file *seq, void *v, loff_t *pos) 1079static void *rose_node_next(struct seq_file *seq, void *v, loff_t *pos)
1080{ 1080{
1081 ++*pos; 1081 ++*pos;
1082 1082
1083 return (v == SEQ_START_TOKEN) ? rose_node_list 1083 return (v == SEQ_START_TOKEN) ? rose_node_list
1084 : ((struct rose_node *)v)->next; 1084 : ((struct rose_node *)v)->next;
1085} 1085}
1086 1086
@@ -1146,7 +1146,7 @@ static void *rose_neigh_start(struct seq_file *seq, loff_t *pos)
1146 if (*pos == 0) 1146 if (*pos == 0)
1147 return SEQ_START_TOKEN; 1147 return SEQ_START_TOKEN;
1148 1148
1149 for (rose_neigh = rose_neigh_list; rose_neigh && i < *pos; 1149 for (rose_neigh = rose_neigh_list; rose_neigh && i < *pos;
1150 rose_neigh = rose_neigh->next, ++i); 1150 rose_neigh = rose_neigh->next, ++i);
1151 1151
1152 return (i == *pos) ? rose_neigh : NULL; 1152 return (i == *pos) ? rose_neigh : NULL;
@@ -1155,8 +1155,8 @@ static void *rose_neigh_start(struct seq_file *seq, loff_t *pos)
1155static void *rose_neigh_next(struct seq_file *seq, void *v, loff_t *pos) 1155static void *rose_neigh_next(struct seq_file *seq, void *v, loff_t *pos)
1156{ 1156{
1157 ++*pos; 1157 ++*pos;
1158 1158
1159 return (v == SEQ_START_TOKEN) ? rose_neigh_list 1159 return (v == SEQ_START_TOKEN) ? rose_neigh_list
1160 : ((struct rose_neigh *)v)->next; 1160 : ((struct rose_neigh *)v)->next;
1161} 1161}
1162 1162
@@ -1171,7 +1171,7 @@ static int rose_neigh_show(struct seq_file *seq, void *v)
1171 int i; 1171 int i;
1172 1172
1173 if (v == SEQ_START_TOKEN) 1173 if (v == SEQ_START_TOKEN)
1174 seq_puts(seq, 1174 seq_puts(seq,
1175 "addr callsign dev count use mode restart t0 tf digipeaters\n"); 1175 "addr callsign dev count use mode restart t0 tf digipeaters\n");
1176 else { 1176 else {
1177 struct rose_neigh *rose_neigh = v; 1177 struct rose_neigh *rose_neigh = v;
@@ -1229,7 +1229,7 @@ static void *rose_route_start(struct seq_file *seq, loff_t *pos)
1229 if (*pos == 0) 1229 if (*pos == 0)
1230 return SEQ_START_TOKEN; 1230 return SEQ_START_TOKEN;
1231 1231
1232 for (rose_route = rose_route_list; rose_route && i < *pos; 1232 for (rose_route = rose_route_list; rose_route && i < *pos;
1233 rose_route = rose_route->next, ++i); 1233 rose_route = rose_route->next, ++i);
1234 1234
1235 return (i == *pos) ? rose_route : NULL; 1235 return (i == *pos) ? rose_route : NULL;
@@ -1238,8 +1238,8 @@ static void *rose_route_start(struct seq_file *seq, loff_t *pos)
1238static void *rose_route_next(struct seq_file *seq, void *v, loff_t *pos) 1238static void *rose_route_next(struct seq_file *seq, void *v, loff_t *pos)
1239{ 1239{
1240 ++*pos; 1240 ++*pos;
1241 1241
1242 return (v == SEQ_START_TOKEN) ? rose_route_list 1242 return (v == SEQ_START_TOKEN) ? rose_route_list
1243 : ((struct rose_route *)v)->next; 1243 : ((struct rose_route *)v)->next;
1244} 1244}
1245 1245
@@ -1253,30 +1253,30 @@ static int rose_route_show(struct seq_file *seq, void *v)
1253 char buf[11]; 1253 char buf[11];
1254 1254
1255 if (v == SEQ_START_TOKEN) 1255 if (v == SEQ_START_TOKEN)
1256 seq_puts(seq, 1256 seq_puts(seq,
1257 "lci address callsign neigh <-> lci address callsign neigh\n"); 1257 "lci address callsign neigh <-> lci address callsign neigh\n");
1258 else { 1258 else {
1259 struct rose_route *rose_route = v; 1259 struct rose_route *rose_route = v;
1260 1260
1261 if (rose_route->neigh1) 1261 if (rose_route->neigh1)
1262 seq_printf(seq, 1262 seq_printf(seq,
1263 "%3.3X %-10s %-9s %05d ", 1263 "%3.3X %-10s %-9s %05d ",
1264 rose_route->lci1, 1264 rose_route->lci1,
1265 rose2asc(&rose_route->src_addr), 1265 rose2asc(&rose_route->src_addr),
1266 ax2asc(buf, &rose_route->src_call), 1266 ax2asc(buf, &rose_route->src_call),
1267 rose_route->neigh1->number); 1267 rose_route->neigh1->number);
1268 else 1268 else
1269 seq_puts(seq, 1269 seq_puts(seq,
1270 "000 * * 00000 "); 1270 "000 * * 00000 ");
1271 1271
1272 if (rose_route->neigh2) 1272 if (rose_route->neigh2)
1273 seq_printf(seq, 1273 seq_printf(seq,
1274 "%3.3X %-10s %-9s %05d\n", 1274 "%3.3X %-10s %-9s %05d\n",
1275 rose_route->lci2, 1275 rose_route->lci2,
1276 rose2asc(&rose_route->dest_addr), 1276 rose2asc(&rose_route->dest_addr),
1277 ax2asc(buf, &rose_route->dest_call), 1277 ax2asc(buf, &rose_route->dest_call),
1278 rose_route->neigh2->number); 1278 rose_route->neigh2->number);
1279 else 1279 else
1280 seq_puts(seq, 1280 seq_puts(seq,
1281 "000 * * 00000\n"); 1281 "000 * * 00000\n");
1282 } 1282 }
diff --git a/net/rose/sysctl_net_rose.c b/net/rose/sysctl_net_rose.c
index 8548c7cf5643..27a452bc5b8d 100644
--- a/net/rose/sysctl_net_rose.c
+++ b/net/rose/sysctl_net_rose.c
@@ -25,7 +25,7 @@ static int min_window[] = {1}, max_window[] = {7};
25static struct ctl_table_header *rose_table_header; 25static struct ctl_table_header *rose_table_header;
26 26
27static ctl_table rose_table[] = { 27static ctl_table rose_table[] = {
28 { 28 {
29 .ctl_name = NET_ROSE_RESTART_REQUEST_TIMEOUT, 29 .ctl_name = NET_ROSE_RESTART_REQUEST_TIMEOUT,
30 .procname = "restart_request_timeout", 30 .procname = "restart_request_timeout",
31 .data = &sysctl_rose_restart_request_timeout, 31 .data = &sysctl_rose_restart_request_timeout,
@@ -36,7 +36,7 @@ static ctl_table rose_table[] = {
36 .extra1 = &min_timer, 36 .extra1 = &min_timer,
37 .extra2 = &max_timer 37 .extra2 = &max_timer
38 }, 38 },
39 { 39 {
40 .ctl_name = NET_ROSE_CALL_REQUEST_TIMEOUT, 40 .ctl_name = NET_ROSE_CALL_REQUEST_TIMEOUT,
41 .procname = "call_request_timeout", 41 .procname = "call_request_timeout",
42 .data = &sysctl_rose_call_request_timeout, 42 .data = &sysctl_rose_call_request_timeout,
@@ -47,7 +47,7 @@ static ctl_table rose_table[] = {
47 .extra1 = &min_timer, 47 .extra1 = &min_timer,
48 .extra2 = &max_timer 48 .extra2 = &max_timer
49 }, 49 },
50 { 50 {
51 .ctl_name = NET_ROSE_RESET_REQUEST_TIMEOUT, 51 .ctl_name = NET_ROSE_RESET_REQUEST_TIMEOUT,
52 .procname = "reset_request_timeout", 52 .procname = "reset_request_timeout",
53 .data = &sysctl_rose_reset_request_timeout, 53 .data = &sysctl_rose_reset_request_timeout,
@@ -58,7 +58,7 @@ static ctl_table rose_table[] = {
58 .extra1 = &min_timer, 58 .extra1 = &min_timer,
59 .extra2 = &max_timer 59 .extra2 = &max_timer
60 }, 60 },
61 { 61 {
62 .ctl_name = NET_ROSE_CLEAR_REQUEST_TIMEOUT, 62 .ctl_name = NET_ROSE_CLEAR_REQUEST_TIMEOUT,
63 .procname = "clear_request_timeout", 63 .procname = "clear_request_timeout",
64 .data = &sysctl_rose_clear_request_timeout, 64 .data = &sysctl_rose_clear_request_timeout,
@@ -69,7 +69,7 @@ static ctl_table rose_table[] = {
69 .extra1 = &min_timer, 69 .extra1 = &min_timer,
70 .extra2 = &max_timer 70 .extra2 = &max_timer
71 }, 71 },
72 { 72 {
73 .ctl_name = NET_ROSE_NO_ACTIVITY_TIMEOUT, 73 .ctl_name = NET_ROSE_NO_ACTIVITY_TIMEOUT,
74 .procname = "no_activity_timeout", 74 .procname = "no_activity_timeout",
75 .data = &sysctl_rose_no_activity_timeout, 75 .data = &sysctl_rose_no_activity_timeout,
@@ -80,7 +80,7 @@ static ctl_table rose_table[] = {
80 .extra1 = &min_idle, 80 .extra1 = &min_idle,
81 .extra2 = &max_idle 81 .extra2 = &max_idle
82 }, 82 },
83 { 83 {
84 .ctl_name = NET_ROSE_ACK_HOLD_BACK_TIMEOUT, 84 .ctl_name = NET_ROSE_ACK_HOLD_BACK_TIMEOUT,
85 .procname = "acknowledge_hold_back_timeout", 85 .procname = "acknowledge_hold_back_timeout",
86 .data = &sysctl_rose_ack_hold_back_timeout, 86 .data = &sysctl_rose_ack_hold_back_timeout,
@@ -91,7 +91,7 @@ static ctl_table rose_table[] = {
91 .extra1 = &min_timer, 91 .extra1 = &min_timer,
92 .extra2 = &max_timer 92 .extra2 = &max_timer
93 }, 93 },
94 { 94 {
95 .ctl_name = NET_ROSE_ROUTING_CONTROL, 95 .ctl_name = NET_ROSE_ROUTING_CONTROL,
96 .procname = "routing_control", 96 .procname = "routing_control",
97 .data = &sysctl_rose_routing_control, 97 .data = &sysctl_rose_routing_control,
@@ -102,7 +102,7 @@ static ctl_table rose_table[] = {
102 .extra1 = &min_route, 102 .extra1 = &min_route,
103 .extra2 = &max_route 103 .extra2 = &max_route
104 }, 104 },
105 { 105 {
106 .ctl_name = NET_ROSE_LINK_FAIL_TIMEOUT, 106 .ctl_name = NET_ROSE_LINK_FAIL_TIMEOUT,
107 .procname = "link_fail_timeout", 107 .procname = "link_fail_timeout",
108 .data = &sysctl_rose_link_fail_timeout, 108 .data = &sysctl_rose_link_fail_timeout,
@@ -113,7 +113,7 @@ static ctl_table rose_table[] = {
113 .extra1 = &min_ftimer, 113 .extra1 = &min_ftimer,
114 .extra2 = &max_ftimer 114 .extra2 = &max_ftimer
115 }, 115 },
116 { 116 {
117 .ctl_name = NET_ROSE_MAX_VCS, 117 .ctl_name = NET_ROSE_MAX_VCS,
118 .procname = "maximum_virtual_circuits", 118 .procname = "maximum_virtual_circuits",
119 .data = &sysctl_rose_maximum_vcs, 119 .data = &sysctl_rose_maximum_vcs,
@@ -124,7 +124,7 @@ static ctl_table rose_table[] = {
124 .extra1 = &min_maxvcs, 124 .extra1 = &min_maxvcs,
125 .extra2 = &max_maxvcs 125 .extra2 = &max_maxvcs
126 }, 126 },
127 { 127 {
128 .ctl_name = NET_ROSE_WINDOW_SIZE, 128 .ctl_name = NET_ROSE_WINDOW_SIZE,
129 .procname = "window_size", 129 .procname = "window_size",
130 .data = &sysctl_rose_window_size, 130 .data = &sysctl_rose_window_size,