aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/plip.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-07-16 20:21:24 -0700
committerDavid S. Miller <davem@davemloft.net>2009-07-16 20:21:24 -0700
commitda8120355e80ddaf534adb8ed910871d97512d56 (patch)
tree9958a6c33e29b5af5faccf6650e98729151618a2 /drivers/net/plip.c
parentc86ae82605ef92594a0de809a8c588ae955fed63 (diff)
parent7fefe6a88494b00b151b5ca7bb84daaa781bbca7 (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/plip.c')
-rw-r--r--drivers/net/plip.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/plip.c b/drivers/net/plip.c
index ef2e229ebc1..00487f569cf 100644
--- a/drivers/net/plip.c
+++ b/drivers/net/plip.c
@@ -270,6 +270,9 @@ static const struct net_device_ops plip_netdev_ops = {
.ndo_stop = plip_close,
.ndo_start_xmit = plip_tx_packet,
.ndo_do_ioctl = plip_ioctl,
+ .ndo_change_mtu = eth_change_mtu,
+ .ndo_set_mac_address = eth_mac_addr,
+ .ndo_validate_addr = eth_validate_addr,
};
/* Entry point of PLIP driver.