summaryrefslogtreecommitdiffstats
path: root/drivers/net/usb/kaweth.c
diff options
context:
space:
mode:
authorDavid S. Miller2009-07-17 05:21:24 +0200
committerDavid S. Miller2009-07-17 05:21:24 +0200
commitda8120355e80ddaf534adb8ed910871d97512d56 (patch)
tree9958a6c33e29b5af5faccf6650e98729151618a2 /drivers/net/usb/kaweth.c
parentgianfar: remove unused DECLARE_MAC_BUF (diff)
parentcdc-eem: bad crc checking (diff)
downloadkernel-qcow2-linux-da8120355e80ddaf534adb8ed910871d97512d56.tar.gz
kernel-qcow2-linux-da8120355e80ddaf534adb8ed910871d97512d56.tar.xz
kernel-qcow2-linux-da8120355e80ddaf534adb8ed910871d97512d56.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/orinoco/main.c
Diffstat (limited to 'drivers/net/usb/kaweth.c')
-rw-r--r--drivers/net/usb/kaweth.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index 09a5bd381566..200fe3d525ca 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -999,6 +999,9 @@ static const struct net_device_ops kaweth_netdev_ops = {
.ndo_tx_timeout = kaweth_tx_timeout,
.ndo_set_multicast_list = kaweth_set_rx_mode,
.ndo_get_stats = kaweth_netdev_stats,
+ .ndo_change_mtu = eth_change_mtu,
+ .ndo_set_mac_address = eth_mac_addr,
+ .ndo_validate_addr = eth_validate_addr,
};
static int kaweth_probe(