linux-toradex.git/net, branch v2.6.27-rc4

pkt_sched: Prevent livelock in TX queue running.

2008-08-19T11:00:36+00:00

If dev_deactivate() is trying to quiesce the queue, it
is theoretically possible for another cpu to livelock
trying to process that queue.  This happens because
dev_deactivate() grabs the queue spinlock as it checks
the queue state, whereas net_tx_action() does a trylock
and reschedules the qdisc if it hits the lock.

This breaks the livelock by adding a check on
__QDISC_STATE_DEACTIVATED to net_tx_action() when
the trylock fails.

Based upon feedback from Herbert Xu and Jarek Poplawski.

Signed-off-by: David S. Miller

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6

2008-08-19T08:33:25+00:00

Revert "pkt_sched: Add BH protection for qdisc_stab_lock."

2008-08-19T05:33:05+00:00

This reverts commit 1cfa26661a85549063e369e2b40275eeaa7b923c.

qdisc_destroy() runs fully under RTNL again and not from softint any
longer, so this change is no longer needed.

Signed-off-by: David S. Miller

Revert "pkt_sched: Protect gen estimators under est_lock."

2008-08-19T05:32:10+00:00

This reverts commit d4766692e72422f3b0f0e9ac6773d92baad07d51.

qdisc_destroy() now runs in RTNL fully again, so this
change is no longer needed.

Signed-off-by: David S. Miller

pkt_sched: remove bogus block (cleanup)

2008-08-19T05:30:01+00:00

...Last block local var got just deleted.

Signed-off-by: Ilpo Järvinen 
Signed-off-by: David S. Miller

nf_nat: use secure_ipv4_port_ephemeral() for NAT port randomization

2008-08-19T04:32:32+00:00

Use incoming network tuple as seed for NAT port randomization.
This avoids concerns of leaking net_random() bits, and also gives better
port distribution. Don't have NAT server, compile tested only.

Signed-off-by: Stephen Hemminger 

[ added missing EXPORT_SYMBOL_GPL ]

Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

netfilter: ctnetlink: sleepable allocation with spin lock bh

2008-08-19T04:31:46+00:00

This patch removes a GFP_KERNEL allocation while holding a spin lock with
bottom halves disabled in ctnetlink_change_helper().

This problem was introduced in 2.6.23 with the netfilter extension
infrastructure.

Signed-off-by: Pablo Neira Ayuso 
Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

netfilter: ctnetlink: fix sleep in read-side lock section

2008-08-19T04:31:24+00:00

Fix allocation with GFP_KERNEL in ctnetlink_create_conntrack() under
read-side lock sections.

This problem was introduced in 2.6.25.

Signed-off-by: Pablo Neira Ayuso 
Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

netfilter: ctnetlink: fix double helper assignation for NAT'ed conntracks

2008-08-19T04:30:55+00:00

If we create a conntrack that has NAT handlings and a helper, the helper
is assigned twice. This happens because nf_nat_setup_info() - via
nf_conntrack_alter_reply() - sets the helper before ctnetlink, which
indeed does not check if the conntrack already has a helper as it thinks that
it is a brand new conntrack.

The fix moves the helper assignation before the set of the status flags.
This avoids a bogus assertion in __nf_ct_ext_add (if netfilter assertions are
enabled) which checks that the conntrack must not be confirmed.

This problem was introduced in 2.6.23 with the netfilter extension
infrastructure.

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

netfilter: ipt_addrtype: Fix matching of inverted destination address type

2008-08-19T04:29:57+00:00

This patch fixes matching of inverted destination address type.

Signed-off-by: Anders Grafström 
Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller