From: David Miller <davem@davemloft.net>
To: g.nault@alphalink.fr
Cc: netdev@vger.kernel.org, jchapman@katalix.com
Subject: Re: [PATCH 1/2] l2tp: fix manual sequencing (de)activation in L2TPv2
Date: Wed, 05 Mar 2014 20:39:51 -0500 (EST) [thread overview]
Message-ID: <20140305.203951.1253631868817773239.davem@davemloft.net> (raw)
In-Reply-To: <7badd5856e70fd63f8b74b361fb499cc8ed7f065.1393966618.git.g.nault@alphalink.fr>
From: Guillaume Nault <g.nault@alphalink.fr>
Date: Tue, 4 Mar 2014 22:25:23 +0100
> diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
> index 735d0f6..735750f 100644
> --- a/net/l2tp/l2tp_core.c
> +++ b/net/l2tp/l2tp_core.c
> @@ -112,7 +112,7 @@ struct l2tp_net {
> spinlock_t l2tp_session_hlist_lock;
> };
>
> -static void l2tp_session_set_header_len(struct l2tp_session *session, int version);
> +void l2tp_session_set_header_len(struct l2tp_session *session, int version);
> static void l2tp_tunnel_free(struct l2tp_tunnel *tunnel);
>
> static inline struct l2tp_tunnel *l2tp_tunnel(struct sock *sk)
You can just remove the declaration...
> diff --git a/net/l2tp/l2tp_core.h b/net/l2tp/l2tp_core.h
> index 1f01ba3..3f93ccd 100644
> --- a/net/l2tp/l2tp_core.h
> +++ b/net/l2tp/l2tp_core.h
> @@ -263,6 +263,7 @@ void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb,
> int length, int (*payload_hook)(struct sk_buff *skb));
> int l2tp_session_queue_purge(struct l2tp_session *session);
> int l2tp_udp_encap_recv(struct sock *sk, struct sk_buff *skb);
> +void l2tp_session_set_header_len(struct l2tp_session *session, int version);
>
> int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb,
> int hdr_len);
Because you added it there.
Please fix this up and resubmit this series, thanks.
next prev parent reply other threads:[~2014-03-06 1:39 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 [this message]
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
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=20140305.203951.1253631868817773239.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).