diff options
| author | Simon Horman <horms@verge.net.au> | 2008-08-19 17:36:22 +1000 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-08-19 17:36:22 +1000 |
| commit | 3f087668c4e7c97289f0a67f9278ae6e0a765a80 (patch) | |
| tree | 6b278344bf96d31a328bf76e445b189bff5f0ce9 /net/bridge | |
| parent | 51df1901394a714d1a17202da02ae4957260eab5 (diff) | |
| parent | e5befbd9525d92bb074b70192eb2c69aae65fc60 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_device.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 9b58d70b0e7d..4f52c3d50ebe 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -148,11 +148,16 @@ static int br_set_tx_csum(struct net_device *dev, u32 data) } static struct ethtool_ops br_ethtool_ops = { - .get_drvinfo = br_getinfo, - .get_link = ethtool_op_get_link, - .set_sg = br_set_sg, - .set_tx_csum = br_set_tx_csum, - .set_tso = br_set_tso, + .get_drvinfo = br_getinfo, + .get_link = ethtool_op_get_link, + .get_tx_csum = ethtool_op_get_tx_csum, + .set_tx_csum = br_set_tx_csum, + .get_sg = ethtool_op_get_sg, + .set_sg = br_set_sg, + .get_tso = ethtool_op_get_tso, + .set_tso = br_set_tso, + .get_ufo = ethtool_op_get_ufo, + .get_flags = ethtool_op_get_flags, }; void br_dev_setup(struct net_device *dev) |