[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20150316_220649_065662.philipp@redfish-solutions.com>
Date: Mon, 16 Mar 2015 16:06:49 -0600
From: philipp@...fish-solutions.com
To: netdev@...r.kernel.org
Subject: [PATCH] iproute2: Fix case of -o (oneline) broken in xfrm
Don't insert newline in -o mode; print mark as hex.
Signed-off-by: Philip Prindeville <philipp@...fish-solutions.com>
---
ip/ipxfrm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c
index f55bff9..810a2bf 100644
--- a/ip/ipxfrm.c
+++ b/ip/ipxfrm.c
@@ -694,7 +694,7 @@ void xfrm_xfrma_print(struct rtattr *tb[], __u16 family,
if (tb[XFRMA_MARK]) {
struct rtattr *rta = tb[XFRMA_MARK];
struct xfrm_mark *m = (struct xfrm_mark *) RTA_DATA(rta);
- fprintf(fp, "\tmark %d/0x%x\n", m->v, m->m);
+ fprintf(fp, "\tmark %#x/%#x%s", m->v, m->m, _SL_);
}
if (tb[XFRMA_ALG_AUTH] && !tb[XFRMA_ALG_AUTH_TRUNC]) {
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists