Merge branch 'master' of git://1984.lsi.us.es/net (1e804aec) · Commits · e / devices / android_kernel_fairphone_FP5

net/bridge/netfilter/ebtables.c

+2 −8

Original line number	Diff line number	Diff line
		@@ -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);