* [PATCH] netfilter updates for 3.3-rc5
@ 2012-03-01 11:02 pablo
2012-03-01 11:02 ` [PATCH] netfilter: bridge: fix module autoload in compat case pablo
2012-03-01 20:40 ` [PATCH] netfilter updates for 3.3-rc5 David Miller
0 siblings, 2 replies; 3+ messages in thread
From: pablo @ 2012-03-01 11:02 UTC (permalink / raw
To: netfilter-devel; +Cc: davem, netdev
From: Pablo Neira Ayuso <pablo@netfilter.org>
Hi David,
This update contains one fix from Florian Westphal for the module
autoload for ebtables.
You can pull this changes from:
git://1984.lsi.us.es/net master
Thanks!
Florian Westphal (1):
netfilter: bridge: fix module autoload in compat case
net/bridge/netfilter/ebtables.c | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
--
1.7.7.3
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] netfilter: bridge: fix module autoload in compat case
2012-03-01 11:02 [PATCH] netfilter updates for 3.3-rc5 pablo
@ 2012-03-01 11:02 ` pablo
2012-03-01 20:40 ` [PATCH] netfilter updates for 3.3-rc5 David Miller
1 sibling, 0 replies; 3+ messages in thread
From: pablo @ 2012-03-01 11:02 UTC (permalink / raw
To: netfilter-devel; +Cc: davem, netdev
From: Florian Westphal <fw@strlen.de>
We expected 0 if module doesn't exist, which is no longer the case
(42046e2e45c109ba703993c510401a11f716c8df,
netfilter: x_tables: return -ENOENT for non-existant matches/targets).
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/bridge/netfilter/ebtables.c | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 5864cc4..8aa4ad0 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -1893,10 +1893,7 @@ static int compat_mtw_from_user(struct compat_ebt_entry_mwt *mwt,
switch (compat_mwt) {
case EBT_COMPAT_MATCH:
- match = try_then_request_module(xt_find_match(NFPROTO_BRIDGE,
- name, 0), "ebt_%s", name);
- if (match == NULL)
- return -ENOENT;
+ match = xt_request_find_match(NFPROTO_BRIDGE, name, 0);
if (IS_ERR(match))
return PTR_ERR(match);
@@ -1915,10 +1912,7 @@ static int compat_mtw_from_user(struct compat_ebt_entry_mwt *mwt,
break;
case EBT_COMPAT_WATCHER: /* fallthrough */
case EBT_COMPAT_TARGET:
- wt = try_then_request_module(xt_find_target(NFPROTO_BRIDGE,
- name, 0), "ebt_%s", name);
- if (wt == NULL)
- return -ENOENT;
+ wt = xt_request_find_target(NFPROTO_BRIDGE, name, 0);
if (IS_ERR(wt))
return PTR_ERR(wt);
off = xt_compat_target_offset(wt);
--
1.7.7.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] netfilter updates for 3.3-rc5
2012-03-01 11:02 [PATCH] netfilter updates for 3.3-rc5 pablo
2012-03-01 11:02 ` [PATCH] netfilter: bridge: fix module autoload in compat case pablo
@ 2012-03-01 20:40 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2012-03-01 20:40 UTC (permalink / raw
To: pablo; +Cc: netfilter-devel, netdev
From: pablo@netfilter.org
Date: Thu, 1 Mar 2012 12:02:18 +0100
> This update contains one fix from Florian Westphal for the module
> autoload for ebtables.
>
> You can pull this changes from:
>
> git://1984.lsi.us.es/net master
Pulled, thanks Pablo.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-03-01 20:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-01 11:02 [PATCH] netfilter updates for 3.3-rc5 pablo
2012-03-01 11:02 ` [PATCH] netfilter: bridge: fix module autoload in compat case pablo
2012-03-01 20:40 ` [PATCH] netfilter updates for 3.3-rc5 David Miller
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 read-only IMAP folder(s) and NNTP newsgroup(s).