|
@@ -1263,7 +1263,7 @@ void __init arp_init(void)
|
|
|
/*
|
|
|
* ax25 -> ASCII conversion
|
|
|
*/
|
|
|
-static char *ax2asc2(ax25_address *a, char *buf)
|
|
|
+static void ax2asc2(ax25_address *a, char *buf)
|
|
|
{
|
|
|
char c, *s;
|
|
|
int n;
|
|
@@ -1285,10 +1285,10 @@ static char *ax2asc2(ax25_address *a, char *buf)
|
|
|
*s++ = n + '0';
|
|
|
*s++ = '\0';
|
|
|
|
|
|
- if (*buf == '\0' || *buf == '-')
|
|
|
- return "*";
|
|
|
-
|
|
|
- return buf;
|
|
|
+ if (*buf == '\0' || *buf == '-') {
|
|
|
+ buf[0] = '*';
|
|
|
+ buf[1] = '\0';
|
|
|
+ }
|
|
|
}
|
|
|
#endif /* CONFIG_AX25 */
|
|
|
|
|
@@ -1322,7 +1322,7 @@ static void arp_format_neigh_entry(struct seq_file *seq,
|
|
|
}
|
|
|
#endif
|
|
|
sprintf(tbuf, "%pI4", n->primary_key);
|
|
|
- seq_printf(seq, "%-16s 0x%-10x0x%-10x%s * %s\n",
|
|
|
+ seq_printf(seq, "%-16s 0x%-10x0x%-10x%-17s * %s\n",
|
|
|
tbuf, hatype, arp_state_to_flags(n), hbuffer, dev->name);
|
|
|
read_unlock(&n->lock);
|
|
|
}
|