aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-03-01 15:40:36 -0500
committerDavid S. Miller <davem@davemloft.net>2012-03-01 15:40:36 -0500
commit1e804aecd7d447d9a939a9376603008af65e52a0 (patch)
tree66bd2cff2fa84c71f9d86c3f52f70b503e6d6cba /net
parent65ec698d1368fc64d0b93fb703783d25ec550577 (diff)
parente899b1119f1428f2b04dd7e9dba94864c33dd30b (diff)
Merge branch 'master' of git://1984.lsi.us.es/net
Diffstat (limited to 'net')
-rw-r--r--net/bridge/netfilter/ebtables.c10
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,
1893 1893
1894 switch (compat_mwt) { 1894 switch (compat_mwt) {
1895 case EBT_COMPAT_MATCH: 1895 case EBT_COMPAT_MATCH:
1896 match = try_then_request_module(xt_find_match(NFPROTO_BRIDGE, 1896 match = xt_request_find_match(NFPROTO_BRIDGE, name, 0);
1897 name, 0), "ebt_%s", name);
1898 if (match == NULL)
1899 return -ENOENT;
1900 if (IS_ERR(match)) 1897 if (IS_ERR(match))
1901 return PTR_ERR(match); 1898 return PTR_ERR(match);
1902 1899
@@ -1915,10 +1912,7 @@ static int compat_mtw_from_user(struct compat_ebt_entry_mwt *mwt,
1915 break; 1912 break;
1916 case EBT_COMPAT_WATCHER: /* fallthrough */ 1913 case EBT_COMPAT_WATCHER: /* fallthrough */
1917 case EBT_COMPAT_TARGET: 1914 case EBT_COMPAT_TARGET:
1918 wt = try_then_request_module(xt_find_target(NFPROTO_BRIDGE, 1915 wt = xt_request_find_target(NFPROTO_BRIDGE, name, 0);
1919 name, 0), "ebt_%s", name);
1920 if (wt == NULL)
1921 return -ENOENT;
1922 if (IS_ERR(wt)) 1916 if (IS_ERR(wt))
1923 return PTR_ERR(wt); 1917 return PTR_ERR(wt);
1924 off = xt_compat_target_offset(wt); 1918 off = xt_compat_target_offset(wt);