aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-10-21 18:42:11 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-10-21 18:42:11 +0000
commit8858d90afe5a6747f3b96c369a1a64ad25f4d0ad (patch)
tree9dc1bba9937f5957c0b3fbe3f3662306088d3208 /target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
parent0ee2fda5e1f6aa62cc401853aead1468ca991eb7 (diff)
downloadupstream-8858d90afe5a6747f3b96c369a1a64ad25f4d0ad.tar.gz
upstream-8858d90afe5a6747f3b96c369a1a64ad25f4d0ad.tar.bz2
upstream-8858d90afe5a6747f3b96c369a1a64ad25f4d0ad.zip
ar71xx: improve 2.6.36 compatibility. also, instead of adding a forward port patch to the 2.6.36 patches, add a backport patch to 2.6.32
SVN-Revision: 23574
Diffstat (limited to 'target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c')
-rw-r--r--target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
index fc838f45b4..45dd3e52c5 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -685,7 +685,6 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
static int ag71xx_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
- struct mii_ioctl_data *data = (struct mii_ioctl_data *) &ifr->ifr_data;
struct ag71xx *ag = netdev_priv(dev);
int ret;
@@ -717,7 +716,7 @@ static int ag71xx_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
if (ag->phy_dev == NULL)
break;
- return phy_mii_ioctl(ag->phy_dev, data, cmd);
+ return phy_mii_ioctl(ag->phy_dev, ifr, cmd);
default:
break;