| From foo@baz Mon Apr 9 17:09:24 CEST 2018 |
| From: Hangbin Liu <liuhangbin@gmail.com> |
| Date: Fri, 22 Dec 2017 15:10:17 +0100 |
| Subject: l2tp: fix missing print session offset info |
| |
| From: Hangbin Liu <liuhangbin@gmail.com> |
| |
| |
| [ Upstream commit 820da5357572715c6235ba3b3daa2d5b43a1198f ] |
| |
| Report offset parameter in L2TP_CMD_SESSION_GET command if |
| it has been configured by userspace |
| |
| Fixes: 309795f4bec ("l2tp: Add netlink control API for L2TP") |
| Reported-by: Jianlin Shi <jishi@redhat.com> |
| Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> |
| Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/l2tp/l2tp_netlink.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/net/l2tp/l2tp_netlink.c |
| +++ b/net/l2tp/l2tp_netlink.c |
| @@ -750,6 +750,8 @@ static int l2tp_nl_session_send(struct s |
| |
| if ((session->ifname[0] && |
| nla_put_string(skb, L2TP_ATTR_IFNAME, session->ifname)) || |
| + (session->offset && |
| + nla_put_u16(skb, L2TP_ATTR_OFFSET, session->offset)) || |
| (session->cookie_len && |
| nla_put(skb, L2TP_ATTR_COOKIE, session->cookie_len, |
| &session->cookie[0])) || |
