netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Miller <davem@davemloft.net>
To: g.nault@alphalink.fr
Cc: netdev@vger.kernel.org, jchapman@katalix.com
Subject: Re: [PATCHv2 net 1/2] l2tp: fix manual sequencing (de)activation in L2TPv2
Date: Thu, 06 Mar 2014 14:26:02 -0500 (EST)	[thread overview]
Message-ID: <20140306.142602.1265342336657169924.davem@davemloft.net> (raw)
In-Reply-To: <4a93fa220e4041046b490ba5957b60a244ebcb44.1394100210.git.g.nault@alphalink.fr>

From: Guillaume Nault <g.nault@alphalink.fr>
Date: Thu, 6 Mar 2014 11:14:30 +0100

> Commit e0d4435f "l2tp: Update PPP-over-L2TP driver to work over L2TPv3"
> broke the PPPOL2TP_SO_SENDSEQ setsockopt. The L2TP header length was
> previously computed by pppol2tp_l2t_header_len() before each call to
> l2tp_xmit_skb(). Now that header length is retrieved from the hdr_len
> session field, this field must be updated every time the L2TP header
> format is modified, or l2tp_xmit_skb() won't push the right amount of
> data for the L2TP header.
> 
> This patch uses l2tp_session_set_header_len() to adjust hdr_len every
> time sequencing is (de)activated from userspace (either by the
> PPPOL2TP_SO_SENDSEQ setsockopt or the L2TP_ATTR_SEND_SEQ netlink
> attribute).
> 
> Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>

Applied.

  reply	other threads:[~2014-03-06 19:26 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-04 21:24 [PATCH 0/2] L2TP fixes Guillaume Nault
2014-03-04 21:25 ` [PATCH 1/2] l2tp: fix manual sequencing (de)activation in L2TPv2 Guillaume Nault
2014-03-06  1:39   ` David Miller
2014-03-04 21:25 ` [PATCH 2/2] l2tp: fix userspace reception on plain L2TP sockets Guillaume Nault
2014-03-04 21:38 ` [PATCH net 0/2] L2TP fixes Guillaume Nault
2014-03-05  7:23 ` [PATCH " James Chapman
2014-03-06 10:14 ` [PATCHv2 net 1/2] l2tp: fix manual sequencing (de)activation in L2TPv2 Guillaume Nault
2014-03-06 19:26   ` David Miller [this message]
2014-03-06 10:15 ` [PATCHv2 net 2/2] l2tp: fix userspace reception on plain L2TP sockets Guillaume Nault
2014-03-06 19:26   ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140306.142602.1265342336657169924.davem@davemloft.net \
    --to=davem@davemloft.net \
    --cc=g.nault@alphalink.fr \
    --cc=jchapman@katalix.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).