* [PATCH] Add arpt_MARK to xt_mark
@ 2015-04-17 2:21 Zhang Chunyu
2015-05-14 11:02 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Zhang Chunyu @ 2015-04-17 2:21 UTC (permalink / raw)
To: netfilter-devel; +Cc: Zhang Chunyu
for http://git.netfilter.org/arptables/commit/?h=next&id=4bb2f8340783fd3a3f70aa6f8807428a280f8474
Signed-off-by: Zhang Chunyu <zhangcy@cn.fujitsu.com>
---
net/netfilter/xt_mark.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/netfilter/xt_mark.c b/net/netfilter/xt_mark.c
index 2334523..ebd41dc 100644
--- a/net/netfilter/xt_mark.c
+++ b/net/netfilter/xt_mark.c
@@ -23,6 +23,7 @@ MODULE_ALIAS("ipt_mark");
MODULE_ALIAS("ip6t_mark");
MODULE_ALIAS("ipt_MARK");
MODULE_ALIAS("ip6t_MARK");
+MODULE_ALIAS("arpt_MARK");
static unsigned int
mark_tg(struct sk_buff *skb, const struct xt_action_param *par)
--
2.3.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Add arpt_MARK to xt_mark
2015-04-17 2:21 [PATCH] Add arpt_MARK to xt_mark Zhang Chunyu
@ 2015-05-14 11:02 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2015-05-14 11:02 UTC (permalink / raw)
To: Zhang Chunyu; +Cc: netfilter-devel
On Fri, Apr 17, 2015 at 10:21:32AM +0800, Zhang Chunyu wrote:
> for http://git.netfilter.org/arptables/commit/?h=next&id=4bb2f8340783fd3a3f70aa6f8807428a280f8474
This was sent when the nf-next merge window was closed, I'm going to
rescue this to let it get upstream.
I have also merged the -next branch into -master in userspace
arptables.
So applied, thanks Zhang.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-05-14 11:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-17 2:21 [PATCH] Add arpt_MARK to xt_mark Zhang Chunyu
2015-05-14 11:02 ` Pablo Neira Ayuso
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.