linux-stable.git/net/bridge/netfilter, branch v3.14

netfilter: nf_tables: rename nft_do_chain_pktinfo() to nft_do_chain()

2014-01-09T19:17:16+00:00

We don't encode argument types into function names and since besides
nft_do_chain() there are only AF-specific versions, there is no risk
of confusion.

Signed-off-by: Patrick McHardy 
Signed-off-by: Pablo Neira Ayuso

netfilter: nf_tables: minor nf_chain_type cleanups

2014-01-09T19:17:15+00:00

Minor nf_chain_type cleanups:

- reorder struct to plug a hoe
- rename struct module member to "owner" for consistency
- rename nf_hookfn array to "hooks" for consistency
- reorder initializers for better readability

Signed-off-by: Patrick McHardy 
Signed-off-by: Pablo Neira Ayuso

netfilter: nf_tables: constify chain type definitions and pointers

2014-01-09T19:17:15+00:00

Signed-off-by: Patrick McHardy 
Signed-off-by: Pablo Neira Ayuso

netfilter: nf_tables: add missing module references to chain types

2014-01-09T19:17:14+00:00

In some cases we neither take a reference to the AF info nor to the
chain type, allowing the module to be unloaded while in use.

Signed-off-by: Patrick McHardy 
Signed-off-by: Pablo Neira Ayuso

netfilter: nf_tables: add support for multi family tables

2014-01-07T22:55:46+00:00

Add support to register chains to multiple hooks for different address
families for mixed IPv4/IPv6 tables.

Signed-off-by: Patrick McHardy

netfilter: nf_tables: make chain types override the default AF functions

2014-01-07T22:50:43+00:00

Currently the AF-specific hook functions override the chain-type specific
hook functions. That doesn't make too much sense since the chain types
are a special case of the AF-specific hooks.

Make the AF-specific hook functions the default and make the optional
chain type hooks override them.

As a side effect, the necessary code restructuring reduces the code size,
f.i. in case of nf_tables_ipv4.o:

  nf_tables_ipv4_init_net   |  -24
  nft_do_chain_ipv4         | -113
 2 functions changed, 137 bytes removed, diff: -137

Signed-off-by: Patrick McHardy 
Signed-off-by: Pablo Neira Ayuso

bridge: change the position of '{' to the pre line

2013-12-20T00:27:26+00:00

That open brace { should be on the previous line.

Signed-off-by: Tan Xiaojun 
Signed-off-by: David S. Miller

bridge: add space before '(/{', after ',', etc.

2013-12-20T00:27:26+00:00

Spaces required before the open parenthesis '(', before the open
brace '{', after that ',' and around that '?/:'.

Signed-off-by: Tan Xiaojun 
Signed-off-by: David S. Miller

bridge: remove unnecessary parentheses

2013-12-20T00:27:26+00:00

Return is not a function, parentheses are not required.

Signed-off-by: Tan Xiaojun 
Signed-off-by: David S. Miller

netfilter: Fix FSF address in file headers

2013-12-06T17:37:57+00:00

Several files refer to an old address for the Free Software Foundation
in the file header comment.  Resolve by replacing the address with
the URL  so that we do not have to keep
updating the header comments anytime the address changes.

CC: netfilter@vger.kernel.org
CC: Pablo Neira Ayuso 
CC: Patrick McHardy 
CC: Jozsef Kadlecsik 
Signed-off-by: Jeff Kirsher 
Signed-off-by: David S. Miller