diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-01 21:40:36 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-01 21:40:36 +0100 |
| commit | 1e804aecd7d447d9a939a9376603008af65e52a0 (patch) | |
| tree | 66bd2cff2fa84c71f9d86c3f52f70b503e6d6cba /net | |
| parent | tg3: Fix tg3_get_stats64 for 5700 / 5701 devs (diff) | |
| parent | netfilter: bridge: fix module autoload in compat case (diff) | |
| download | linux-1e804aecd7d447d9a939a9376603008af65e52a0.tar.xz linux-1e804aecd7d447d9a939a9376603008af65e52a0.zip | |
Merge branch 'master' of git://1984.lsi.us.es/net
Diffstat (limited to 'net')
| -rw-r--r-- | 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 5864cc491369..8aa4ad0e06af 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); |