| Message ID | 1513913532-8090-1-git-send-email-liuhangbin@gmail.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [PATCHv2,net] l2tp: fix missing print session offset info | expand |
> Fixes: 309795f4bec ("l2tp: Add netlink control API for L2TP") > Reported-by: Jianlin Shi <jishi@redhat.com> > Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> > --- > net/l2tp/l2tp_netlink.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c > index a1f24fb..36378b4 100644 > --- a/net/l2tp/l2tp_netlink.c > +++ b/net/l2tp/l2tp_netlink.c > @@ -761,6 +761,8 @@ static int l2tp_nl_session_send(struct sk_buff *skb, u32 portid, u32 seq, int fl > > 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])) || > -- > 2.5.5 > Hi David, please hold on a while with this patch, I will send it in a patchset that addresses some offset related stuff. Regards, Lorenzo
diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c index a1f24fb..36378b4 100644 --- a/net/l2tp/l2tp_netlink.c +++ b/net/l2tp/l2tp_netlink.c @@ -761,6 +761,8 @@ static int l2tp_nl_session_send(struct sk_buff *skb, u32 portid, u32 seq, int fl 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])) ||
Fixes: 309795f4bec ("l2tp: Add netlink control API for L2TP") Reported-by: Jianlin Shi <jishi@redhat.com> Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> --- net/l2tp/l2tp_netlink.c | 2 ++ 1 file changed, 2 insertions(+)