[kernel] refresh 2.6.32 patches

[openwrt.git] / target / linux / ar71xx / files / drivers / net / ag71xx / ag71xx_main.c

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 fc838f4..31c8ee4 100644 (file)
--- 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)
 {
 
 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;
 
        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;
 
                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;
 
        default:
                break;


@@ -991,7 +990,7 @@ static const struct net_device_ops ag71xx_netdev_ops = {
 #endif
 };
 
 #endif
 };
 

-static int __init ag71xx_probe(struct platform_device *pdev)
+static int __devinit ag71xx_probe(struct platform_device *pdev)

 {
        struct net_device *dev;
        struct resource *res;
 {
        struct net_device *dev;
        struct resource *res;


@@ -1123,7 +1122,7 @@ static int __init ag71xx_probe(struct platform_device *pdev)
        return err;
 }
 
        return err;
 }
 

-static int __exit ag71xx_remove(struct platform_device *pdev)
+static int __devexit ag71xx_remove(struct platform_device *pdev)

 {
        struct net_device *dev = platform_get_drvdata(pdev);
 
 {
        struct net_device *dev = platform_get_drvdata(pdev);