bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Applied ethtool patch from Jun Yuan.

This commit is contained in:
Florian Pose 2012-07-23 12:23:42 +02:00
parent f0d04969d7
commit 170110f787
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devices/e1000e/ethtool-2.6.33-ethercat.c
View File

@ -378,6 +378,9 @@ static int e1000_set_rx_csum(struct net_device *netdev, u32 data)
{
struct e1000_adapter *adapter = netdev_priv(netdev);
if (adapter->ecdev)
return -EBUSY;
if (data)
adapter->flags |= FLAG_RX_CSUM_ENABLED;
else
@ -397,10 +400,6 @@ static u32 e1000_get_tx_csum(struct net_device *netdev)
static int e1000_set_tx_csum(struct net_device *netdev, u32 data)
{
struct e1000_adapter *adapter = netdev_priv(netdev);
if (adapter->ecdev)
return -EBUSY;
if (data)
netdev->features |= NETIF_F_HW_CSUM;
else
@ -1945,6 +1944,10 @@ static int e1000_set_coalesce(struct net_device *netdev,
static int e1000_nway_reset(struct net_device *netdev)
{
struct e1000_adapter *adapter = netdev_priv(netdev);
if (adapter->ecdev)
return -EBUSY;
if (netif_running(netdev))
e1000e_reinit_locked(adapter);
return 0;