linux.git/net/bridge/netfilter, branch v3.3-rc2 Linux kernel source tree net:bridge: use IS_ENABLED 2011-12-16T20:49:52+00:00 Igor Maravić igorm@etf.rs 2011-12-12T02:58:25+00:00 e6373c4c0ecb3a944c34117a3daeac315d641b5f Use IS_ENABLED(CONFIG_FOO) instead of defined(CONFIG_FOO) || defined (CONFIG_FOO_MODULE) Signed-off-by: Igor Maravić <igorm@etf.rs> Signed-off-by: David S. Miller <davem@davemloft.net> 
Use IS_ENABLED(CONFIG_FOO)
instead of defined(CONFIG_FOO) || defined (CONFIG_FOO_MODULE)

Signed-off-by: Igor Maravić <igorm@etf.rs>
Signed-off-by: David S. Miller <davem@davemloft.net>
ipv6: Add fragment reporting to ipv6_skip_exthdr(). 2011-12-03T17:35:10+00:00 Jesse Gross jesse@nicira.com 2011-12-01T01:05:51+00:00 75f2811c6460ccc59d83c66059943ce9c9f81a18 While parsing through IPv6 extension headers, fragment headers are skipped making them invisible to the caller. This reports the fragment offset of the last header in order to make it possible to determine whether the packet is fragmented and, if so whether it is a first or last fragment. Signed-off-by: Jesse Gross <jesse@nicira.com> 
While parsing through IPv6 extension headers, fragment headers are
skipped making them invisible to the caller.  This reports the
fragment offset of the last header in order to make it possible to
determine whether the packet is fragmented and, if so whether it is
a first or last fragment.

Signed-off-by: Jesse Gross <jesse@nicira.com>
netfilter: Remove unnecessary OOM logging messages 2011-11-01T08:19:49+00:00 Joe Perches joe@perches.com 2011-08-29T21:17:25+00:00 0a9ee81349d90c6c85831f38118bf569c60a4d51 Site specific OOM messages are duplications of a generic MM out of memory message and aren't really useful, so just delete them. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> 
Site specific OOM messages are duplications of a generic MM
out of memory message and aren't really useful, so just
delete them.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Merge branch 'master' of github.com:davem330/net 2011-09-22T07:23:13+00:00 David S. Miller davem@davemloft.net 2011-09-22T07:23:13+00:00 8decf868790b48a727d7e7ca164f2bcd3c1389c0 Conflicts: MAINTAINERS drivers/net/Kconfig drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c drivers/net/ethernet/broadcom/tg3.c drivers/net/wireless/iwlwifi/iwl-pci.c drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c drivers/net/wireless/rt2x00/rt2800usb.c drivers/net/wireless/wl12xx/main.c 
Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6 2011-08-30T21:43:56+00:00 David S. Miller davem@davemloft.net 2011-08-30T21:43:56+00:00 785824165508a65478474f0c87f6b8c3ad048c62 






Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
2011-08-20T17:39:12+00:00

David S. Miller
davem@davemloft.net

2011-08-20T17:39:12+00:00

823dcd2506fa369aeb8cbd26da5663efe2fda9a9












net/bridge/netfilter/ebtables.c: use available error handling code
2011-08-11T12:52:57+00:00

Julia Lawall
julia@diku.dk

2011-08-11T01:59:38+00:00

5189054dd7ff18576446edc270b6b69fa8285336

Free the locally allocated table and newinfo as done in adjacent error
handling code.

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>





Free the locally allocated table and newinfo as done in adjacent error
handling code.

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>







rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTER
2011-08-02T11:29:23+00:00

Stephen Hemminger
shemminger@vyatta.com

2011-08-01T16:19:00+00:00

a9b3cd7f323b2e57593e7215362a7b02fc933e3a

When assigning a NULL value to an RCU protected pointer, no barrier
is needed. The rcu_assign_pointer, used to handle that but will soon
change to not handle the special case.

Convert all rcu_assign_pointer of NULL value.

//smpl
@@ expression P; @@

- rcu_assign_pointer(P, NULL)
+ RCU_INIT_POINTER(P, NULL)

// </smpl>

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>





When assigning a NULL value to an RCU protected pointer, no barrier
is needed. The rcu_assign_pointer, used to handle that but will soon
change to not handle the special case.

Convert all rcu_assign_pointer of NULL value.

//smpl
@@ expression P; @@

- rcu_assign_pointer(P, NULL)
+ RCU_INIT_POINTER(P, NULL)

// </smpl>

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>







netfilter: ebtables: fix ebtables build dependency
2011-07-29T14:40:30+00:00

Bart De Schuymer
bdschuym@pandora.be

2011-07-29T14:40:30+00:00

9823d9ff483af4ce8804a9eb69600ca739cd1f58

The configuration of ebtables shouldn't depend on
CONFIG_BRIDGE_NETFILTER, only on CONFIG_NETFILTER.

Reported-by: Sébastien Laveze <slaveze@gmail.com>
Signed-off-by: Bart De Schuymer <bdschuym@pandora.be>
Signed-off-by: Patrick McHardy <kaber@trash.net>





The configuration of ebtables shouldn't depend on
CONFIG_BRIDGE_NETFILTER, only on CONFIG_NETFILTER.

Reported-by: Sébastien Laveze <slaveze@gmail.com>
Signed-off-by: Bart De Schuymer <bdschuym@pandora.be>
Signed-off-by: Patrick McHardy <kaber@trash.net>







net, netfilter: Remove redundant goto in ebt_ulog_packet
2011-07-21T12:02:17+00:00

Jesper Juhl
jj@chaosbits.net

2011-07-17T17:56:38+00:00

f0da7ee410e63a1521af734c3970acc1470e8c50

In net/bridge/netfilter/ebt_ulog.c:ebt_ulog_packet() the 'goto unlock'
before the 'alloc_failure' label is completely redundant. This patch
removes it.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>





In net/bridge/netfilter/ebt_ulog.c:ebt_ulog_packet() the 'goto unlock'
before the 'alloc_failure' label is completely redundant. This patch
removes it.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>