[PATCH] iproute2: Fix case of -o (oneline) broken in xfrm
From: <hidden>
Date: 2015-03-16 22:13:52
Don't insert newline in -o mode; print mark as hex.
Signed-off-by: Philip Prindeville <redacted>
---
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]) {