| Message ID | 1271349703.1726.62.camel@Joe-Laptop.home |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Joe Perches wrote: > Signed-off-by: Joe Perches <joe@perches.com> Acked-by: James Chapman <jchapman@katalix.com> > --- > net/l2tp/l2tp_debugfs.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/l2tp/l2tp_debugfs.c b/net/l2tp/l2tp_debugfs.c > index 908f10f..104ec3b 100644 > --- a/net/l2tp/l2tp_debugfs.c > +++ b/net/l2tp/l2tp_debugfs.c > @@ -122,8 +122,8 @@ static void l2tp_dfs_seq_tunnel_show(struct seq_file *m, void *v) > seq_printf(m, "\nTUNNEL %u peer %u", tunnel->tunnel_id, tunnel->peer_tunnel_id); > if (tunnel->sock) { > struct inet_sock *inet = inet_sk(tunnel->sock); > - seq_printf(m, " from " NIPQUAD_FMT " to " NIPQUAD_FMT "\n", > - NIPQUAD(inet->inet_saddr), NIPQUAD(inet->inet_daddr)); > + seq_printf(m, " from %pI4 to %pI4\n", > + &inet->inet_saddr, &inet->inet_daddr); > if (tunnel->encap == L2TP_ENCAPTYPE_UDP) > seq_printf(m, " source port %hu, dest port %hu\n", > ntohs(inet->inet_sport), ntohs(inet->inet_dport)); > > > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: James Chapman <jchapman@katalix.com> Date: Thu, 15 Apr 2010 19:44:51 +0100 > Joe Perches wrote: >> Signed-off-by: Joe Perches <joe@perches.com> > Acked-by: James Chapman <jchapman@katalix.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/l2tp/l2tp_debugfs.c b/net/l2tp/l2tp_debugfs.c index 908f10f..104ec3b 100644 --- a/net/l2tp/l2tp_debugfs.c +++ b/net/l2tp/l2tp_debugfs.c @@ -122,8 +122,8 @@ static void l2tp_dfs_seq_tunnel_show(struct seq_file *m, void *v) seq_printf(m, "\nTUNNEL %u peer %u", tunnel->tunnel_id, tunnel->peer_tunnel_id); if (tunnel->sock) { struct inet_sock *inet = inet_sk(tunnel->sock); - seq_printf(m, " from " NIPQUAD_FMT " to " NIPQUAD_FMT "\n", - NIPQUAD(inet->inet_saddr), NIPQUAD(inet->inet_daddr)); + seq_printf(m, " from %pI4 to %pI4\n", + &inet->inet_saddr, &inet->inet_daddr); if (tunnel->encap == L2TP_ENCAPTYPE_UDP) seq_printf(m, " source port %hu, dest port %hu\n", ntohs(inet->inet_sport), ntohs(inet->inet_dport));
Signed-off-by: Joe Perches <joe@perches.com> --- net/l2tp/l2tp_debugfs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html