diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 17:20:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 17:20:11 -0700 |
| commit | f7402dc44d617be807e7184c6c624611b2d35b4e (patch) | |
| tree | 1df6e5877ee3083838c7956285a5966d78d0646f /net/netrom/af_netrom.c | |
| parent | e72225d160a2529d6ce6d5898a267f7dae02aa6e (diff) | |
| parent | 832079d29a781ddf89467662ab4b540f0c1e668a (diff) | |
| download | op-kernel-dev-f7402dc44d617be807e7184c6c624611b2d35b4e.zip op-kernel-dev-f7402dc44d617be807e7184c6c624611b2d35b4e.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/netrom/af_netrom.c')
| -rw-r--r-- | net/netrom/af_netrom.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 4b53de9..f4578c7 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -1261,6 +1261,7 @@ static int nr_info_show(struct seq_file *seq, void *v) struct net_device *dev; struct nr_sock *nr; const char *devname; + char buf[11]; if (v == SEQ_START_TOKEN) seq_puts(seq, @@ -1276,11 +1277,11 @@ static int nr_info_show(struct seq_file *seq, void *v) else devname = dev->name; - seq_printf(seq, "%-9s ", ax2asc(&nr->user_addr)); - seq_printf(seq, "%-9s ", ax2asc(&nr->dest_addr)); + seq_printf(seq, "%-9s ", ax2asc(buf, &nr->user_addr)); + seq_printf(seq, "%-9s ", ax2asc(buf, &nr->dest_addr)); 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", - ax2asc(&nr->source_addr), + ax2asc(buf, &nr->source_addr), devname, nr->my_index, nr->my_id, |
