From 4c493506d5c2599a0ba74283f8f7b0ceeccc63c7 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Wed, 24 Jun 2009 16:32:33 -0700 Subject: [PATCH] --- yaml --- r: 154484 b: refs/heads/master c: 6a9b6546164fb380a019f92ca4d76443202fdc4f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/cpmac.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4923e70909c9..da55776f61f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 245acb87729bc76ba65c7476665c01837e0cdccb +refs/heads/master: 6a9b6546164fb380a019f92ca4d76443202fdc4f diff --git a/trunk/drivers/net/cpmac.c b/trunk/drivers/net/cpmac.c index 58afafbd3b9c..fd5e32cbcb87 100644 --- a/trunk/drivers/net/cpmac.c +++ b/trunk/drivers/net/cpmac.c @@ -1097,7 +1097,7 @@ static const struct net_device_ops cpmac_netdev_ops = { .ndo_start_xmit = cpmac_start_xmit, .ndo_tx_timeout = cpmac_tx_timeout, .ndo_set_multicast_list = cpmac_set_multicast_list, - .ndo_so_ioctl = cpmac_ioctl, + .ndo_do_ioctl = cpmac_ioctl, .ndo_set_config = cpmac_config, .ndo_change_mtu = eth_change_mtu, .ndo_validate_addr = eth_validate_addr,