linux.git/net/core, branch v3.6-rc4

net/core/dev.c: fix kernel-doc warning

2012-08-20T10:00:55+00:00

Fix kernel-doc warning:

Warning(net/core/dev.c:5745): No description found for parameter 'dev'

Signed-off-by: Randy Dunlap 
Cc:	"David S. Miller" 
Cc:	netdev@vger.kernel.org
Signed-off-by: David S. Miller

af_packet: don't emit packet on orig fanout group

2012-08-20T09:37:29+00:00

If a packet is emitted on one socket in one group of fanout sockets,
it is transmitted again. It is thus read again on one of the sockets
of the fanout group. This result in a loop for software which
generate packets when receiving one.
This retransmission is not the intended behavior: a fanout group
must behave like a single socket. The packet should not be
transmitted on a socket if it originates from a socket belonging
to the same fanout group.

This patch fixes the issue by changing the transmission check to
take fanout group info account.

Reported-by: Aleksandr Kotov 
Signed-off-by: Eric Leblond 
Signed-off-by: David S. Miller

net: netprio: fix cgrp create and write priomap race

2012-08-16T21:56:11+00:00

A race exists where creating cgroups and also updating the priomap
may result in losing a priomap update. This is because priomap
writers are not protected by rtnl_lock.

Move priority writer into rtnl_lock()/rtnl_unlock().

CC: Neil Horman 
Reported-by: Al Viro 
Signed-off-by: John Fastabend 
Acked-by: Neil Horman 
Signed-off-by: David S. Miller

net: netprio: fd passed in SCM_RIGHTS datagram not set correctly

2012-08-16T21:56:11+00:00

A socket fd passed in a SCM_RIGHTS datagram was not getting
updated with the new tasks cgrp prioidx. This leaves IO on
the socket tagged with the old tasks priority.

To fix this add a check in the scm recvmsg path to update the
sock cgrp prioidx with the new tasks value.

Thanks to Al Viro for catching this.

CC: Neil Horman 
Reported-by: Al Viro 
Signed-off-by: John Fastabend 
Acked-by: Neil Horman 
Signed-off-by: David S. Miller

net: netprio: fix files lock and remove useless d_path bits

2012-08-16T21:56:11+00:00

Add lock to prevent a race with a file closing and also remove
useless and ugly sscanf code. The extra code was never needed
and the case it supposedly protected against is in fact handled
correctly by sock_from_file as pointed out by Al Viro.

CC: Neil Horman 
Reported-by: Al Viro 
Signed-off-by: John Fastabend 
Acked-by: Neil Horman 
Signed-off-by: David S. Miller

netpoll: re-enable irq in poll_napi()

2012-08-14T21:33:33+00:00

napi->poll() needs IRQ enabled, so we have to re-enable IRQ before
calling it.

Cc: David Miller 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

netpoll: handle vlan tags in netpoll tx and rx path

2012-08-14T21:33:32+00:00

Without this patch, I can't get netconsole logs remotely over
vlan. The reason is probably we don't handle vlan tags in either
netpoll tx or rx path.

I am not sure if I use these vlan functions correctly, at
least this patch works.

Cc: Benjamin LaHaise 
Cc: Patrick McHardy 
Cc: David Miller 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

netpoll: take rcu_read_lock_bh() in netpoll_send_skb_on_dev()

2012-08-14T21:33:31+00:00

This patch fixes several problems in the call path of
netpoll_send_skb_on_dev():

1. Disable IRQ's before calling netpoll_send_skb_on_dev().

2. All the callees of netpoll_send_skb_on_dev() should use
   rcu_dereference_bh() to dereference ->npinfo.

3. Rename arp_reply() to netpoll_arp_reply(), the former is too generic.

Cc: "David S. Miller" 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

netpoll: take rcu_read_lock_bh() in netpoll_rx()

2012-08-14T21:33:31+00:00

In __netpoll_rx(), it dereferences ->npinfo without rcu_dereference_bh(),
this patch fixes it by using the 'npinfo' passed from netpoll_rx()
where it is already dereferenced with rcu_dereference_bh().

Cc: "David S. Miller" 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

netpoll: make __netpoll_cleanup non-block

2012-08-14T21:33:30+00:00

Like the previous patch, slave_disable_netpoll() and __netpoll_cleanup()
may be called with read_lock() held too, so we should make them
non-block, by moving the cleanup and kfree() to call_rcu_bh() callbacks.

Cc: "David S. Miller" 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller