linux.git/drivers/net, branch v3.4-rc6

sungem: Fix WakeOnLan

2012-05-03T05:42:55+00:00

WakeOnLan was broken in this driver because gp->asleep_wol is a 1-bit
bitfield and it was being assigned WAKE_MAGIC, which is (1 << 5).
gp->asleep_wol remains 0 and the machine never wakes up.  Fixed by casting
gp->wake_on_lan to bool.  Tested on an iBook G4.

Signed-off-by: Gerard Lledo 
Signed-off-by: David S. Miller

usbnet: fix failure handling in usbnet_probe

2012-05-03T00:13:04+00:00

If register_netdev returns failure, the dev->interrupt and
its transfer buffer should be released, so just fix it.

Signed-off-by: Ming Lei 
Signed-off-by: David S. Miller

usbnet: fix leak of transfer buffer of dev->interrupt

2012-05-03T00:13:03+00:00

The transfer buffer of dev->interrupt is allocated in .probe path,
but not freed in .disconnet path, so mark the interrupt URB as
URB_FREE_BUFFER to free the buffer when the URB is destroyed.

Signed-off-by: Ming Lei 
Acked-by: Oliver Neukum 
Signed-off-by: David S. Miller

ucc_geth: Add 16 bytes to max TX frame for VLANs

2012-05-03T00:09:04+00:00

Creating a VLAN interface on top of ucc_geth adds 4 bytes
to the frame and the HW controller is not prepared to
TX a frame bigger than 1518 bytes which is 4 bytes too
small for a full VLAN frame. Add 16 bytes which will handle
the a simple VLAN and leaves 12 bytes for future expansion.

Signed-off-by: Joakim Tjernlund 
Signed-off-by: David S. Miller

net: ucc_geth, increase no. of HW RX descriptors

2012-05-03T00:09:04+00:00

In a busy network we see ucc_geth is dropping RX pkgs every now
and then. Increase the RX queues HW descriptors from
16 to 32 to deal with this.

Signed-off-by: Joakim Tjernlund 
Signed-off-by: David S. Miller

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem

2012-05-01T18:14:05+00:00

sky2: fix receive length error in mixed non-VLAN/VLAN traffic

2012-05-01T17:39:13+00:00

Bug: The VLAN bit of the MAC RX Status Word is unreliable in several older
supported chips. Sometimes the VLAN bit is not set for valid VLAN packets
and also sometimes the VLAN bit is set for non-VLAN packets that came after
a VLAN packet. This results in a receive length error when VLAN hardware
tagging is enabled.

Fix: Variation on original fix proposed by Mirko.
The VLAN information is decoded in the status loop, and can be
applied to the received SKB there. This eliminates the need for the
separate tag field in the interface data structure. The tag has to
be copied and cleared if packet is copied. This version checked out
with vlan and normal traffic.

Note: vlan_tx_tag_present should be renamed vlan_tag_present, but that
is outside scope of this.

Reported-by: Mirko Lindner 
Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller

sky2: propogate rx hash when packet is copied

2012-05-01T17:39:13+00:00

When a small packet is received, the driver copies it to a new skb to allow
reusing the full size Rx buffer. The copy was propogating the checksum offload
but not the receive hash information. The bug is impact was mostly harmless
and therefore not observed until reviewing this area of code.

Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller

cxgb3: Don't call cxgb_vlan_mode until q locks are initialized

2012-05-01T02:08:44+00:00

The driver calls cxgb_vlan_mode() from init_one().  This calls into
synchronize_rx(), which locks all the q locks, but the q locks are not
initialized until cxgb_up() -> setup_sge_qsets().  So move the call to
cxgb_vlan_mode() into cxgb_up(), after the call to setup_sge_qsets().
We also move the body of these functions up higher to avoid having to
a forward declaration.

This was found because of the lockdep warning:

    INFO: trying to register non-static key.
    the code is fine but needs lockdep annotation.
    turning off the locking correctness validator.
    Pid: 323, comm: work_for_cpu Not tainted 3.4.0-rc5 #28
    Call Trace:
     [] register_lock_class+0x108/0x2d0
     [] __lock_acquire+0xd3/0xd06
     [] lock_acquire+0xbf/0xfe
     [] _raw_spin_lock_irq+0x36/0x45
     [] cxgb_vlan_mode+0x96/0xcb [cxgb3]
     [] init_one+0x8c4/0x980 [cxgb3]
     [] local_pci_probe+0x3f/0x70
     [] do_work_for_cpu+0x10/0x22
     [] kthread+0xa1/0xa9
     [] kernel_thread_helper+0x4/0x10

Contrary to what lockdep says, the code is not fine: we are locking an
uninitialized spinlock.

Signed-off-by: Roland Dreier 
Signed-off-by: David S. Miller

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net

2012-05-01T02:04:20+00:00