kernel.git/net/8021q, branch linux-2.6.28.y

vlan: Fix typos in proc output string

2008-11-10T21:37:40Z

Signed-off-by: Ferenc Wagner Signed-off-by: David S. Miller

net: fix packet socket delivery in rx irq handler

2008-11-04T22:49:57Z

The changes to deliver hardware accelerated VLAN packets to packet sockets (commit bc1d0411) caused a warning for non-NAPI drivers. The __vlan_hwaccel_rx() function is called directly from the drivers RX function, for non-NAPI drivers that means its still in RX IRQ context: [ 27.779463] ------------[ cut here ]------------ [ 27.779509] WARNING: at kernel/softirq.c:136 local_bh_enable+0x37/0x81() ... [ 27.782520] [] netif_nit_deliver+0x5b/0x75 [ 27.782590] [] __vlan_hwaccel_rx+0x79/0x162 [ 27.782664] [] atl1_intr+0x9a9/0xa7c [atl1] [ 27.782738] [] handle_IRQ_event+0x23/0x51 [ 27.782808] [] handle_edge_irq+0xc2/0x102 [ 27.782878] [] do_IRQ+0x4d/0x64 Split hardware accelerated VLAN reception into two parts to fix this: - __vlan_hwaccel_rx just stores the VLAN TCI and performs the VLAN device lookup, then calls netif_receive_skb()/netif_rx() - vlan_hwaccel_do_receive(), which is invoked by netif_receive_skb() in softirq context, performs the real reception and delivery to packet sockets. Reported-and-tested-by: Ramon Casellas Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller

net: Use hton[sl]() instead of __constant_hton[sl]() where applicable

2008-09-21T05:20:49Z

Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller

vlan: vlan device not reading gso max size of parent.

2008-09-12T03:17:05Z

The vlan devices are not reading the gso max size of the parent device. As a result devices that do not support 64K max gso size are currently failing. This issue is seen on 2.6.26 kernels as well and the same patch should be able to be applied without any issues. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller

netdev: Handle ->addr_list_lock just like ->_xmit_lock for lockdep.

2008-07-22T21:16:42Z

The new address list lock needs to handle the same device layering issues that the _xmit_lock one does. This integrates work done by Patrick McHardy. Signed-off-by: David S. Miller

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

2008-07-18T09:39:39Z

Conflicts: Documentation/powerpc/booting-without-of.txt drivers/atm/Makefile drivers/net/fs_enet/fs_enet-main.c drivers/pci/pci-acpi.c net/8021q/vlan.c net/iucv/iucv.c

netdev: Allocate multiple queues for TX.

2008-07-18T02:21:00Z

alloc_netdev_mq() now allocates an array of netdev_queue structures for TX, based upon the queue_count argument. Furthermore, all accesses to the TX queues are now vectored through the netdev_get_tx_queue() and netdev_for_each_tx_queue() interfaces. This makes it easy to grep the tree for all things that want to get to a TX queue of a net device. Problem spots which are not really multiqueue aware yet, and only work with one queue, can easily be spotted by grepping for all netdev_get_tx_queue() calls that pass in a zero index. Signed-off-by: David S. Miller

vlan: remove unnecessary include statements

2008-07-15T05:51:55Z

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

vlan: clean up hard_start_xmit functions

2008-07-15T05:51:39Z

Remove excessive comments and debugging, use NETDEV_TX codes, remove some empty lines. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller

vlan: clean up vlan_dev_hard_header()

2008-07-15T05:51:19Z

Remove some debugging and excessive comments, merge the two dev_hard_header calls into one. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller