Changeset 8148


Ignore:
Timestamp:
2007-07-24T23:50:02+02:00 (11 years ago)
Author:
blogic
Message:

added the au1000 pci and eth0 fixes to the 7.07 tag

Location:
tags/kamikaze_7.07/target/linux/au1000-2.6/patches
Files:
2 added
1 edited

Legend:

Unmodified
Added
Removed
  • tags/kamikaze_7.07/target/linux/au1000-2.6/patches/014-au1000_eth_ioctl.patch

    r8139 r8148  
    1 diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c 
    2 index c27cfce..99a1c61 100644 
    3 --- a/drivers/net/au1000_eth.c 
    4 +++ b/drivers/net/au1000_eth.c 
    5 @@ -1316,12 +1316,20 @@ static void set_rx_mode(struct net_device *dev) 
     1--- linux-2.6.22.1.orig/drivers/net/au1000_eth.c        2007-07-24 18:43:25.527583520 +0200 
     2+++ linux-2.6.22.1/drivers/net/au1000_eth.c     2007-07-24 23:07:00.388821102 +0200 
     3@@ -1320,9 +1320,12 @@ 
     4        } 
     5 } 
     6  
     7+#define AU1000_KNOWN_PHY_IOCTLS                (SIOCGMIIPHY & 0xfff0) 
    68 static int au1000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 
    79 { 
    810        struct au1000_private *aup = (struct au1000_private *)dev->priv; 
    9 +       struct mii_ioctl_data *data = if_mii(rq); 
    10 +       int rc = -EOPNOTSUPP; 
     11+       if((cmd & AU1000_KNOWN_PHY_IOCTLS) != AU1000_KNOWN_PHY_IOCTLS) 
     12+               return -EINVAL; 
    1113  
    1214        if (!netif_running(dev)) return -EINVAL; 
    1315  
    14         if (!aup->phy_dev) return -EINVAL; // PHY not controllable 
    15   
    16 -       return phy_mii_ioctl(aup->phy_dev, if_mii(rq), cmd); 
    17 +       switch (cmd) { 
    18 +       default: 
    19 +               rc = phy_mii_ioctl(aup->phy_dev, data, cmd); 
    20 +               break; 
    21 +       } 
    22 + 
    23 +       return rc; 
    24  } 
    25   
    26  static struct net_device_stats *au1000_get_stats(struct net_device *dev) 
Note: See TracChangeset for help on using the changeset viewer.