linux.git/drivers/net/usb, branch v3.11-rc5

net/usb/r8152: adjust relative ocp function

2013-07-31T21:49:13+00:00

- fix the conversion between cpu and __le32
 - replace some pla_ocp and usb_ocp functions with generic_ocp function

Signed-off-by: Hayes Wang 
Signed-off-by: David S. Miller

net/usb/r8152: make sure the USB buffer is DMA-able

2013-07-31T21:49:13+00:00

Allocate the required memory before calling usb_control_msg. And
the additional memory copy is necessary.

Signed-off-by: Hayes Wang 
Acked-by: Greg Kroah-Hartman 
Signed-off-by: David S. Miller

net/usb/r815x: change the return value for bind functions

2013-07-31T21:49:13+00:00

Replace 0 with the result from usbnet_cdc_bind().

Signed-off-by: Hayes Wang 
Signed-off-by: David S. Miller

net/usb/r815x: avoid to call mdio functions for runtime-suspended device

2013-07-31T21:49:13+00:00

Don't replace the usb_control_msg() with usbnet_{read,write}_cmd()
which couldn't be called inside suspend/resume callback. Keep the
basic functions unlimited. Instead, using usb_autopm_get_interface()
and usb_autopm_put_interface() in r815x_mdio_{read,write}().

Signed-off-by: Hayes Wang 
Signed-off-by: David S. Miller

net/usb/r815x: replace USB buffer from stack to DMA-able

2013-07-31T21:49:12+00:00

Some USB buffers use stack which may not be DMA-able.
Use the buffers from kmalloc to replace those one.

Signed-off-by: Hayes Wang 
Acked-by: Greg Kroah-Hartman 
Signed-off-by: David S. Miller

usbnet: do not pretend to support SG/TSO

2013-07-26T20:48:22+00:00

usbnet doesn't support yet SG, so drivers should not advertise SG or TSO
capabilities, as they allow TCP stack to build large TSO packets that
need to be linearized and might use order-5 pages.

This adds an extra copy overhead and possible allocation failures.

Current code ignore skb_linearize() return code so crashes are even
possible.

Best is to not pretend SG/TSO is supported, and add this again when/if
usbnet really supports SG for devices who could get a performance gain.

Based on a prior patch from Freddy Xin 

Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

usb/net/r815x: fix cast to restricted __le32

2013-07-12T23:13:34+00:00

>> drivers/net/usb/r815x.c:38:16: sparse: cast to restricted __le32
>> drivers/net/usb/r815x.c:67:15: sparse: cast to restricted __le32
>> drivers/net/usb/r815x.c:69:13: sparse: incorrect type in assignment (different base types)
   drivers/net/usb/r815x.c:69:13:    expected unsigned int [unsigned] [addressable] [assigned] [usertype] tmp
   drivers/net/usb/r815x.c:69:13:    got restricted __le32 [usertype] 

Signed-off-by: Hayes Wang 
Spotted-by: kbuild test robot 
Signed-off-by: David S. Miller

usb/net/r8152: fix integer overflow in expression

2013-07-12T23:13:34+00:00

config: make ARCH=avr32 allyesconfig
drivers/net/usb/r8152.c: In function 'rtl8152_start_xmit':
drivers/net/usb/r8152.c:956: warning: integer overflow in expression

   955	memset(tx_desc, 0, sizeof(*tx_desc));
 > 956	tx_desc->opts1 = cpu_to_le32((len & TX_LEN_MASK) | TX_FS | TX_LS);
   957	tp->tx_skb = skb;

Signed-off-by: Hayes Wang 
Spotted-by: kbuild test robot 
Signed-off-by: David S. Miller

net/usb: add relative mii functions for r815x

2013-07-12T00:11:01+00:00

Base on cdc_ether, add the mii functions for RTL8152 and RTL8153.
The RTL8152 and RTL8153 support ECM mode which use the driver of
cdc_ether. Add the mii functions. Then, the basic PHY access is
possible.

Signed-off-by: Hayes Wang 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-07-03T21:55:13+00:00

Conflicts:
	drivers/net/ethernet/freescale/fec_main.c
	drivers/net/ethernet/renesas/sh_eth.c
	net/ipv4/gre.c

The GRE conflict is between a bug fix (kfree_skb --> kfree_skb_list)
and the splitting of the gre.c code into seperate files.

The FEC conflict was two sets of changes adding ethtool support code
in an "!CONFIG_M5272" CPP protected block.

Finally the sh_eth.c conflict was between one commit add bits set
in the .eesr_err_check mask whilst another commit removed the
.tx_error_check member and assignments.

Signed-off-by: David S. Miller