summaryrefslogtreecommitdiffstats
path: root/drivers/net/benet/be_ethtool.c
diff options
context:
space:
mode:
authorJ. Bruce Fields2009-10-27 23:45:17 +0100
committerJ. Bruce Fields2009-10-27 23:45:17 +0100
commite343eb0d60f74547e0aeb5bd151105c2e6cfe588 (patch)
tree92586df0daf3298262a957640e5c86679c963f41 /drivers/net/benet/be_ethtool.c
parentnfsd41: use sv_max_mesg for forechannel max sizes (diff)
parentLinux 2.6.32-rc5 (diff)
downloadkernel-qcow2-linux-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.tar.gz
kernel-qcow2-linux-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.tar.xz
kernel-qcow2-linux-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.zip
Merge commit 'v2.6.32-rc5' into for-2.6.33
Diffstat (limited to 'drivers/net/benet/be_ethtool.c')
-rw-r--r--drivers/net/benet/be_ethtool.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c
index 11445df3dbc0..cda5bf2fc50a 100644
--- a/drivers/net/benet/be_ethtool.c
+++ b/drivers/net/benet/be_ethtool.c
@@ -358,7 +358,7 @@ const struct ethtool_ops be_ethtool_ops = {
.get_rx_csum = be_get_rx_csum,
.set_rx_csum = be_set_rx_csum,
.get_tx_csum = ethtool_op_get_tx_csum,
- .set_tx_csum = ethtool_op_set_tx_csum,
+ .set_tx_csum = ethtool_op_set_tx_hw_csum,
.get_sg = ethtool_op_get_sg,
.set_sg = ethtool_op_set_sg,
.get_tso = ethtool_op_get_tso,