diff options
Diffstat (limited to 'net/rose/rose_route.c')
-rw-r--r-- | net/rose/rose_route.c | 36 |
1 files changed, 18 insertions, 18 deletions
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) | |||
1079 | static void *rose_node_next(struct seq_file *seq, void *v, loff_t *pos) | 1079 | static 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) | |||
1155 | static void *rose_neigh_next(struct seq_file *seq, void *v, loff_t *pos) | 1155 | static 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) | |||
1238 | static void *rose_route_next(struct seq_file *seq, void *v, loff_t *pos) | 1238 | static 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 | } |