From: David S. Miller <davem@davemloft.net>
Date: Thu, 19 Feb 2015 20:08:47 +0000 (-0500)
Subject: Merge branch 'r8152-next'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a53c4bf7f27f043564f5bdace12405c54265cb66;p=linux-beck.git

Merge branch 'r8152-next'

Hayes Wang says:

====================
Adjust the settings about USB_RX_EARLY_AGG

v2:
For patch #1, replace

	u32 ocp_data;
	ocp_data = tp->coalesce / 8;

with

	u32 ocp_data = tp->coalesce / 8;

And replace

	struct net_device *dev = tp->netdev;
	u32 ocp_data;
	ocp_data = (agg_buf_sz - dev->mtu - VLAN_ETH_HLEN - VLAN_HLEN) / 4;

with

	u32 mtu = tp->netdev->mtu;
	u32 ocp_data = (agg_buf_sz - mtu - VLAN_ETH_HLEN - VLAN_HLEN) / 4;

Use *switch* statement to replace the checking of *if*.

v1:
The USB_RX_EARLY_AGG contains timeout and size. Separate them, and
they could be set independently. Then, the ethtool could be used to
change the timeout according to situation of the platform.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

a53c4bf7f27f043564f5bdace12405c54265cb66