Revert "netfilter: ensure number of counters is >0 in do_replace()"
authorBernhard Thaler <bernhard.thaler@wvnet.at>
Thu, 28 May 2015 08:26:18 +0000 (10:26 +0200)
committerWilly Tarreau <w@1wt.eu>
Sun, 21 Aug 2016 21:22:32 +0000 (23:22 +0200)
commiteb4a7d671bb54008039dfd99bc45a39e4f73a516
tree336aa6d6bea3901f2c153fc3b3e491f8f542fa88
parent151cc2f5e35f3babc90a1a3cf23d2ac80c7b5803
Revert "netfilter: ensure number of counters is >0 in do_replace()"

commit d26e2c9ffa385dd1b646f43c1397ba12af9ed431 upstream.

This partially reverts commit 1086bbe97a07 ("netfilter: ensure number of
counters is >0 in do_replace()") in net/bridge/netfilter/ebtables.c.

Setting rules with ebtables does not work any more with 1086bbe97a07 place.

There is an error message and no rules set in the end.

e.g.

~# ebtables -t nat -A POSTROUTING --src 12:34:56:78:9a:bc -j DROP
Unable to update the kernel. Two possible causes:
1. Multiple ebtables programs were executing simultaneously. The ebtables
   userspace tool doesn't by default support multiple ebtables programs
running

Reverting the ebtables part of 1086bbe97a07 makes this work again.

Signed-off-by: Bernhard Thaler <bernhard.thaler@wvnet.at>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
net/bridge/netfilter/ebtables.c