diff options
| author | Lendacky, Thomas <[email protected]> | 2014-10-22 16:26:11 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2014-10-22 21:50:31 +0000 |
| commit | 386f1c9650b7fe4849d2942bd42f41f0ca3aedfb (patch) | |
| tree | 433ae2dd5f2b847400a381fb5faf3777d8c62b98 | |
| parent | net: fec: ptp: fix NULL pointer dereference if ptp_clock is not set (diff) | |
| download | kernel-386f1c9650b7fe4849d2942bd42f41f0ca3aedfb.tar.gz kernel-386f1c9650b7fe4849d2942bd42f41f0ca3aedfb.zip | |
amd-xgbe: Properly handle feature changes via ethtool
The ndo_set_features callback function was improperly using an unsigned
int to save the current feature value for features such as NETIF_F_RXCSUM.
Since that feature is in the upper 32 bits of a 64 bit variable the
result was always 0 making it not possible to actually turn off the
hardware RX checksum support. Change the unsigned int type to the
netdev_features_t type in order to properly capture the current value
and perform the proper operation.
Signed-off-by: Tom Lendacky <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c index 29554992215a..a480b231ba37 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c @@ -1465,7 +1465,7 @@ static int xgbe_set_features(struct net_device *netdev, { struct xgbe_prv_data *pdata = netdev_priv(netdev); struct xgbe_hw_if *hw_if = &pdata->hw_if; - unsigned int rxcsum, rxvlan, rxvlan_filter; + netdev_features_t rxcsum, rxvlan, rxvlan_filter; rxcsum = pdata->netdev_features & NETIF_F_RXCSUM; rxvlan = pdata->netdev_features & NETIF_F_HW_VLAN_CTAG_RX; |