diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-08 12:25:28 +0200 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-08 12:26:15 +0200 |
commit | a131bc185528331451a93db6c50a7d2070376a61 (patch) | |
tree | 18cccd206d4835ee8df147ac3b0c0e30cc00680d /drivers/net/8139too.c | |
parent | intel-iommu: Unify hardware and software passthrough support (diff) | |
parent | Merge git://git.infradead.org/~dwmw2/iommu-2.6.31 (diff) | |
download | linux-a131bc185528331451a93db6c50a7d2070376a61.tar.xz linux-a131bc185528331451a93db6c50a7d2070376a61.zip |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Pull fixes in from 2.6.31 so that people testing the iommu-2.6.git tree
no longer trip over bugs which were already fixed (sorry, Horms).
Diffstat (limited to 'drivers/net/8139too.c')
-rw-r--r-- | drivers/net/8139too.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index 8ae72ec14456..0e2ba21d4441 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c @@ -908,6 +908,7 @@ static const struct net_device_ops rtl8139_netdev_ops = { .ndo_open = rtl8139_open, .ndo_stop = rtl8139_close, .ndo_get_stats = rtl8139_get_stats, + .ndo_change_mtu = eth_change_mtu, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = rtl8139_set_mac_address, .ndo_start_xmit = rtl8139_start_xmit, |