diff options
author | David S. Miller <davem@davemloft.net> | 2009-07-16 23:21:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-16 23:21:24 -0400 |
commit | da8120355e80ddaf534adb8ed910871d97512d56 (patch) | |
tree | 9958a6c33e29b5af5faccf6650e98729151618a2 /drivers/net/usb/kaweth.c | |
parent | c86ae82605ef92594a0de809a8c588ae955fed63 (diff) | |
parent | 7fefe6a88494b00b151b5ca7bb84daaa781bbca7 (diff) |
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.c | 3 |
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 = { | |||
999 | .ndo_tx_timeout = kaweth_tx_timeout, | 999 | .ndo_tx_timeout = kaweth_tx_timeout, |
1000 | .ndo_set_multicast_list = kaweth_set_rx_mode, | 1000 | .ndo_set_multicast_list = kaweth_set_rx_mode, |
1001 | .ndo_get_stats = kaweth_netdev_stats, | 1001 | .ndo_get_stats = kaweth_netdev_stats, |
1002 | .ndo_change_mtu = eth_change_mtu, | ||
1003 | .ndo_set_mac_address = eth_mac_addr, | ||
1004 | .ndo_validate_addr = eth_validate_addr, | ||
1002 | }; | 1005 | }; |
1003 | 1006 | ||
1004 | static int kaweth_probe( | 1007 | static int kaweth_probe( |