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

Browse source

Pablo Neira Ayuso says:

====================
The following patchset contains Netfilter fixes for your net tree,
they are:

* Don't generate audit log message if audit is not enabled, from Gao Feng.

* Fix logging formatting for packets dropped by helpers, by Joe Perches.

* Fix a compilation warning in nfnetlink if CONFIG_PROVE_RCU is not set,
  from Paul Bolle.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2013-03-07 15:20:02 -05:00

parent 8b4cd8a053 9df9e78323

commit 43b18db8a2

3 changed files with 14 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

11

net/netfilter/nf_conntrack_helper.c

View file

7

net/netfilter/nfnetlink.c

View file

3

net/netfilter/xt_AUDIT.c

View file