evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://1984.lsi.us.es/net

Browse source
This commit is contained in:
David S. Miller 2012-03-01 15:40:36 -05:00
commit 1e804aecd7
1 changed files with 2 additions and 8 deletions

10
net/bridge/netfilter/ebtables.c
View file

@ -1893,10 +1893,7 @@ static int compat_mtw_from_user(struct compat_ebt_entry_mwt *mwt,
switch (compat_mwt) { switch (compat_mwt) {
case EBT_COMPAT_MATCH: case EBT_COMPAT_MATCH:
match = try_then_request_module(xt_find_match(NFPROTO_BRIDGE, match = xt_request_find_match(NFPROTO_BRIDGE, name, 0);
name, 0), "ebt_%s", name);
if (match == NULL)
return -ENOENT;
if (IS_ERR(match)) if (IS_ERR(match))
return PTR_ERR(match); return PTR_ERR(match);
@ -1915,10 +1912,7 @@ static int compat_mtw_from_user(struct compat_ebt_entry_mwt *mwt,
break; break;
case EBT_COMPAT_WATCHER: /* fallthrough */ case EBT_COMPAT_WATCHER: /* fallthrough */
case EBT_COMPAT_TARGET: case EBT_COMPAT_TARGET:
wt = try_then_request_module(xt_find_target(NFPROTO_BRIDGE, wt = xt_request_find_target(NFPROTO_BRIDGE, name, 0);
name, 0), "ebt_%s", name);
if (wt == NULL)
return -ENOENT;
if (IS_ERR(wt)) if (IS_ERR(wt))
return PTR_ERR(wt); return PTR_ERR(wt);
off = xt_compat_target_offset(wt); off = xt_compat_target_offset(wt);