linux.git/drivers/net/usb, branch v4.0-rc2

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

2015-02-19T18:36:45+00:00

Pull kconfig updates from Michal Marek:
 "Yann E Morin was supposed to take over kconfig maintainership, but
  this hasn't happened.  So I'm sending a few kconfig patches that I
  collected:

   - Fix for missing va_end in kconfig
   - merge_config.sh displays used if given too few arguments
   - s/boolean/bool/ in Kconfig files for consistency, with the plan to
     only support bool in the future"

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kconfig: use va_end to match corresponding va_start
  merge_config.sh: Display usage if given too few arguments
  kconfig: use bool instead of boolean for type definition attributes

r8152: restore hw settings

2015-02-15T04:15:45+00:00

There is a capability which let the hw could change the settings
automatically when the power change to ON. However, the USB reset
would reset the settings to the hw default, so the driver has to
restore the relative settings. Otherwise, it would influence the
functions of the hw, and the compatibility for the USB hub and
USB host controller.

The relative settings are as following.
 - set the power down scale to 96.
 - enable the power saving function of USB 2.0.
 - disable the ALDPS of ECM mode.
 - set burst mode depending on the burst size.
 - enable the flow control of endpoint full.
 - set fifo empty boundary to 32448 bytes.
 - enable the function of exiting LPM when Rx OK occurs.
 - set the connect timer to 1.

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

hso: fix rx parsing logic when skb allocation fails

2015-02-13T15:17:05+00:00

If skb allocation fails once the IP header has been received, the rx state is
being set to WAIT_SYNC. The logic, though, shouldn't directly return, as the
buffer may contain a full packet, and therefore the WAIT_SYNC state needs to be
processed (resetting state to WAIT_IP, clearing rx_buf_size and re-initializing
rx_buf_missing).

So, just let the while loop continue so that in the next iteration the WAIT_SYNC
state cleanly stops the loop. The WAIT_SYNC processing will be done just after
that, only if the end of packet is flagged.

Signed-off-by: Aleksander Morgado 
Signed-off-by: David S. Miller

r8152: use BIT macro

2015-02-08T06:46:25+00:00

Use BIT macro to replace (1 << bits).

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

r8152: replace get_protocol with vlan_get_protocol

2015-02-08T06:46:25+00:00

vlan_get_protocol() has been defined and use it to replace
get_protocol().

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

r8152: adjust the line feed for hw_features

2015-02-08T06:46:25+00:00

Keep NETIF_F_HW_VLAN_CTAG_RX and NETIF_F_HW_VLAN_CTAG_TX at the
same line.

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

r8152: check RTL8152_UNPLUG for rtl8152_close

2015-02-08T06:46:25+00:00

It is unnecessary to accress the hw register if the device is unplugged.

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

r8152: check linking status with netif_carrier_ok

2015-02-08T06:46:25+00:00

Replace (tp->speed & LINK_STATUS) with netif_carrier_ok().

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

r8152: adjust lpm timer

2015-02-08T06:46:24+00:00

Set LPM timer to 500us, except for RTL_VER_04 which doesn't link at
USB 3.0.

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

r8152: adjust rx_bottom

2015-02-08T06:46:24+00:00

If a error occurs when submitting rx, skip the remaining submissions
and try to submit them again next time.

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