| Message ID | 1513838730-14033-1-git-send-email-liuhangbin@gmail.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] l2tp: fix missing print session offset info | expand |
From: Hangbin Liu <liuhangbin@gmail.com> Date: Thu, 21 Dec 2017 14:45:30 +0800 > + (session->offset && > + nla_put_u16(skb, L2TP_ATTR_OFFSET, session->offset) || It really discourages people from reviewing your changes when they don't even compile. net/l2tp/l2tp_netlink.c: In function ‘l2tp_nl_session_send’: net/l2tp/l2tp_netlink.c:764:23: warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses] (session->offset && ~~~~~~~~~~~~~~~~^~ nla_put_u16(skb, L2TP_ATTR_OFFSET, session->offset) || ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ net/l2tp/l2tp_netlink.c:782:3: error: expected ‘)’ before ‘goto’ goto nla_put_failure; ^~~~ ...
On Thu, Dec 21, 2017 at 03:08:36PM -0500, David Miller wrote: > From: Hangbin Liu <liuhangbin@gmail.com> > Date: Thu, 21 Dec 2017 14:45:30 +0800 > > > + (session->offset && > > + nla_put_u16(skb, L2TP_ATTR_OFFSET, session->offset) || > > It really discourages people from reviewing your changes when they > don't even compile. Sh*t, I did compile and test my patch on the compiler. But forgot to the fix the code on my laptop...Really sorry for this, I need to double check it before send.
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(+)