| Message ID | 1429237292-17701-1-git-send-email-zhangcy@cn.fujitsu.com |
|---|---|
| State | Accepted |
| Delegated to: | Pablo Neira |
| Headers | show |
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.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
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)
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(+)