* [PATCH] net/netfilter/nf_nat_core.h was removed by d2c5c103b1337f590b7edf1509a6e294bdf22402
@ 2019-03-14 18:25 Bruno Wolff III
2019-03-14 18:52 ` Jason A. Donenfeld
0 siblings, 1 reply; 11+ messages in thread
From: Bruno Wolff III @ 2019-03-14 18:25 UTC (permalink / raw)
To: wireguard
It looks like net/netfilter/nf_nat_core.h isn't needed any more and things
seemed to work without it.
Signed-off-by: Bruno Wolff III <bruno@wolff.to>
---
src/compat/compat.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/compat/compat.h b/src/compat/compat.h
index 7a61e4c1a5cd..2dcdbaeb0ad6 100644
--- a/src/compat/compat.h
+++ b/src/compat/compat.h
@@ -792,7 +792,9 @@ struct __kernel_timespec {
#include <net/ipv6.h>
#include <net/icmp.h>
#include <net/netfilter/nf_conntrack.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
#include <net/netfilter/nf_nat_core.h>
+#endif
static inline void new_icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
{
enum ip_conntrack_info ctinfo;
--
2.21.0
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH] net/netfilter/nf_nat_core.h was removed by d2c5c103b1337f590b7edf1509a6e294bdf22402
@ 2019-03-14 5:32 Bruno Wolff III
0 siblings, 0 replies; 11+ messages in thread
From: Bruno Wolff III @ 2019-03-14 5:32 UTC (permalink / raw)
To: wireguard
It looks like net/netfilter/nf_nat_core.h isn't needed any more and things
seemed to work without it.
---
src/compat/compat.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/compat/compat.h b/src/compat/compat.h
index 7a61e4c1a5cd..2dcdbaeb0ad6 100644
--- a/src/compat/compat.h
+++ b/src/compat/compat.h
@@ -792,7 +792,9 @@ struct __kernel_timespec {
#include <net/ipv6.h>
#include <net/icmp.h>
#include <net/netfilter/nf_conntrack.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
#include <net/netfilter/nf_nat_core.h>
+#endif
static inline void new_icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
{
enum ip_conntrack_info ctinfo;
--
2.21.0
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH] net/netfilter/nf_nat_core.h was removed by d2c5c103b1337f590b7edf1509a6e294bdf22402
@ 2019-03-14 5:24 Bruno Wolff III
0 siblings, 0 replies; 11+ messages in thread
From: Bruno Wolff III @ 2019-03-14 5:24 UTC (permalink / raw)
To: wireguard
It looks like net/netfilter/nf_nat_core.h isn't needed any more and things
seemed to work without it.
---
src/compat/compat.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/compat/compat.h b/src/compat/compat.h
index 7a61e4c1a5cd..2dcdbaeb0ad6 100644
--- a/src/compat/compat.h
+++ b/src/compat/compat.h
@@ -792,7 +792,9 @@ struct __kernel_timespec {
#include <net/ipv6.h>
#include <net/icmp.h>
#include <net/netfilter/nf_conntrack.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
#include <net/netfilter/nf_nat_core.h>
+#endif
static inline void new_icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
{
enum ip_conntrack_info ctinfo;
--
2.21.0
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH] net/netfilter/nf_nat_core.h was removed by d2c5c103b1337f590b7edf1509a6e294bdf22402
@ 2019-03-14 5:21 Bruno Wolff III
2019-03-14 5:34 ` Bruno Wolff III
0 siblings, 1 reply; 11+ messages in thread
From: Bruno Wolff III @ 2019-03-14 5:21 UTC (permalink / raw)
To: wireguard
It looks like net/netfilter/nf_nat_core.h isn't needed any more and things
seemed to work without it.
---
src/compat/compat.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/compat/compat.h b/src/compat/compat.h
index 7a61e4c1a5cd..2dcdbaeb0ad6 100644
--- a/src/compat/compat.h
+++ b/src/compat/compat.h
@@ -792,7 +792,9 @@ struct __kernel_timespec {
#include <net/ipv6.h>
#include <net/icmp.h>
#include <net/netfilter/nf_conntrack.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
#include <net/netfilter/nf_nat_core.h>
+#endif
static inline void new_icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
{
enum ip_conntrack_info ctinfo;
--
2.21.0
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH] net/netfilter/nf_nat_core.h was removed by d2c5c103b1337f590b7edf1509a6e294bdf22402
2019-03-14 5:21 Bruno Wolff III
@ 2019-03-14 5:34 ` Bruno Wolff III
2019-03-14 7:10 ` Aleksa Sarai
0 siblings, 1 reply; 11+ messages in thread
From: Bruno Wolff III @ 2019-03-14 5:34 UTC (permalink / raw)
To: wireguard
Sorry about the duplicates. I git confused trying to use git email-send.
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] net/netfilter/nf_nat_core.h was removed by d2c5c103b1337f590b7edf1509a6e294bdf22402
2019-03-14 5:34 ` Bruno Wolff III
@ 2019-03-14 7:10 ` Aleksa Sarai
2019-03-14 12:41 ` Bruno Wolff III
0 siblings, 1 reply; 11+ messages in thread
From: Aleksa Sarai @ 2019-03-14 7:10 UTC (permalink / raw)
To: Bruno Wolff III; +Cc: wireguard
[-- Attachment #1.1: Type: text/plain, Size: 1144 bytes --]
On 2019-03-14, Bruno Wolff III <bruno@wolff.to> wrote:
> Sorry about the duplicates. I git confused trying to use git email-send.
For future reference, you want to send a patch series. The way I do it
is I first generate all of the patches:
% git format-patch <base-commit>
Which will then generate NNNN-patch_description.patch files. Modify
these to your heart's content (you can also generate a cover page with
--cover-letter to git format-patch, or a version number with -v).
Then, you can send them all *as one series* by doing:
% git send-email --no-chain-reply-to --no-format-patch \
--to=<to-list> --cc=<cc-list> \
*.patch
(This makes them all one thread so it's far more obvious which patches
go together -- since it looks like you were sending multiple patches
separately, which causes confusion for folks reading them.)
You're also missing a Signed-off-by:, but I'm not sure if WireGuard
contributions require those (you can add them with `git commit -s`).
--
Aleksa Sarai
Senior Software Engineer (Containers)
SUSE Linux GmbH
<https://www.cyphar.com/>
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 148 bytes --]
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH] net/netfilter/nf_nat_core.h was removed by d2c5c103b1337f590b7edf1509a6e294bdf22402
2019-03-14 7:10 ` Aleksa Sarai
@ 2019-03-14 12:41 ` Bruno Wolff III
2019-03-14 13:24 ` Luis Ressel
0 siblings, 1 reply; 11+ messages in thread
From: Bruno Wolff III @ 2019-03-14 12:41 UTC (permalink / raw)
To: Aleksa Sarai; +Cc: wireguard
On Thu, Mar 14, 2019 at 18:10:24 +1100,
Aleksa Sarai <cyphar@cyphar.com> wrote:
>
>For future reference, you want to send a patch series. The way I do it
>is I first generate all of the patches:
Thanks. That isn't what I was trying to do here, but something I might
do in the future. Here the two patches were separate, nit part of the
series. I got confused in that I thought the mail wasn't getting set
and tried a few different varients of the --smtp-server= option, most
of which actually worked.
>You're also missing a Signed-off-by:, but I'm not sure if WireGuard
>contributions require those (you can add them with `git commit -s`).
Can you set up your config to do that automatically or are you supposed
to do that manually for each commit to make sure you really mean it?
In this case, one patch is trivial and the other needs to be reworked,
so I doubt it matters.
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] net/netfilter/nf_nat_core.h was removed by d2c5c103b1337f590b7edf1509a6e294bdf22402
2019-03-14 12:41 ` Bruno Wolff III
@ 2019-03-14 13:24 ` Luis Ressel
0 siblings, 0 replies; 11+ messages in thread
From: Luis Ressel @ 2019-03-14 13:24 UTC (permalink / raw)
To: wireguard
On Thu, Mar 14, 2019 at 07:41:34AM -0500, Bruno Wolff III wrote:
> On Thu, Mar 14, 2019 at 18:10:24 +1100,
> Aleksa Sarai <cyphar@cyphar.com> wrote:
>
> > You're also missing a Signed-off-by:, but I'm not sure if WireGuard
> > contributions require those (you can add them with `git commit -s`).
Yes, it is indeed neccessary to sign off all contributions to wireguard.
> Can you set up your config to do that automatically or are you supposed to
> do that manually for each commit to make sure you really mean it?
Yes and no. There's no way to make git append the s-o-b line to all
commit messages, but if you enable the format.signOff config option,
it will at least add the line when you invoke git format-patch or git
send-email.
Cheers,
Luis
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] net/netfilter/nf_nat_core.h was removed by d2c5c103b1337f590b7edf1509a6e294bdf22402
@ 2019-03-14 5:14 Bruno Wolff III
2019-03-14 17:05 ` Bruno Wolff III
0 siblings, 1 reply; 11+ messages in thread
From: Bruno Wolff III @ 2019-03-14 5:14 UTC (permalink / raw)
To: wireguard
It looks like net/netfilter/nf_nat_core.h isn't needed any more and things
seemed to work without it.
---
src/compat/compat.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/compat/compat.h b/src/compat/compat.h
index 7a61e4c1a5cd..2dcdbaeb0ad6 100644
--- a/src/compat/compat.h
+++ b/src/compat/compat.h
@@ -792,7 +792,9 @@ struct __kernel_timespec {
#include <net/ipv6.h>
#include <net/icmp.h>
#include <net/netfilter/nf_conntrack.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
#include <net/netfilter/nf_nat_core.h>
+#endif
static inline void new_icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
{
enum ip_conntrack_info ctinfo;
--
2.21.0
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-03-20 22:19 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-14 18:25 [PATCH] net/netfilter/nf_nat_core.h was removed by d2c5c103b1337f590b7edf1509a6e294bdf22402 Bruno Wolff III
2019-03-14 18:52 ` Jason A. Donenfeld
-- strict thread matches above, loose matches on Subject: below --
2019-03-14 5:32 Bruno Wolff III
2019-03-14 5:24 Bruno Wolff III
2019-03-14 5:21 Bruno Wolff III
2019-03-14 5:34 ` Bruno Wolff III
2019-03-14 7:10 ` Aleksa Sarai
2019-03-14 12:41 ` Bruno Wolff III
2019-03-14 13:24 ` Luis Ressel
2019-03-14 5:14 Bruno Wolff III
2019-03-14 17:05 ` Bruno Wolff III
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).