diff options
author | David S. Miller <davem@davemloft.net> | 2009-10-07 07:43:16 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-07 07:43:16 +0200 |
commit | 7ecc59c1b7fd5749667fc31f8683099cbef38977 (patch) | |
tree | 560d8ce48fac50758d1af6d722bc0bb0c7de2a34 /drivers/net/benet/be_ethtool.c | |
parent | net: speedup sk_wake_async() (diff) | |
parent | gigaset: add kerneldoc comments (diff) | |
download | linux-7ecc59c1b7fd5749667fc31f8683099cbef38977.tar.xz linux-7ecc59c1b7fd5749667fc31f8683099cbef38977.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/benet/be_ethtool.c')
-rw-r--r-- | drivers/net/benet/be_ethtool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c index 851543a040cb..77c66da8738c 100644 --- a/drivers/net/benet/be_ethtool.c +++ b/drivers/net/benet/be_ethtool.c @@ -363,7 +363,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, |