linux/ixp4xx: sync 2.6.36 patches to 2.6.36-rc6

[openwrt.git] / target / linux / ixp4xx / patches-2.6.35 / 207-npe_driver_multiphy_support.patch

diff --git a/target/linux/ixp4xx/patches-2.6.35/207-npe_driver_multiphy_support.patch b/target/linux/ixp4xx/patches-2.6.35/207-npe_driver_multiphy_support.patch
index afcf7e1..20a5119 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.35/207-npe_driver_multiphy_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.35/207-npe_driver_multiphy_support.patch
@@ -37,7 +37,7 @@ TODO: take care of additional PHYs through the PHY abstraction layer
  /* Information about built-in HSS (synchronous serial) interfaces */
 --- a/drivers/net/arm/ixp4xx_eth.c
 +++ b/drivers/net/arm/ixp4xx_eth.c
  /* Information about built-in HSS (synchronous serial) interfaces */
 --- a/drivers/net/arm/ixp4xx_eth.c
 +++ b/drivers/net/arm/ixp4xx_eth.c

-@@ -417,6 +417,37 @@ static int ixp4xx_phy_connect(struct net
+@@ -418,6 +418,37 @@ static int ixp4xx_phy_connect(struct net

        struct eth_plat_info *plat = port->plat;
        char phy_id[MII_BUS_ID_SIZE + 3];
  
        struct eth_plat_info *plat = port->plat;
        char phy_id[MII_BUS_ID_SIZE + 3];
  


@@ -75,7 +75,7 @@ TODO: take care of additional PHYs through the PHY abstraction layer
        snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, "0", plat->phy);
        port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, 0,
                                   PHY_INTERFACE_MODE_MII);
        snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, "0", plat->phy);
        port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, 0,
                                   PHY_INTERFACE_MODE_MII);

-@@ -438,21 +469,32 @@ static void ixp4xx_phy_disconnect(struct
+@@ -439,21 +470,32 @@ static void ixp4xx_phy_disconnect(struct

  {
        struct port *port = netdev_priv(dev);
  
  {
        struct port *port = netdev_priv(dev);
  


@@ -111,7 +111,7 @@ TODO: take care of additional PHYs through the PHY abstraction layer
  }
  
  static inline void debug_pkt(struct net_device *dev, const char *func,
  }
  
  static inline void debug_pkt(struct net_device *dev, const char *func,

-@@ -826,6 +868,10 @@ static int eth_ioctl(struct net_device *
+@@ -829,6 +871,10 @@ static int eth_ioctl(struct net_device *

  
        if (!netif_running(dev))
                return -EINVAL;
  
        if (!netif_running(dev))
                return -EINVAL;


@@ -122,7 +122,7 @@ TODO: take care of additional PHYs through the PHY abstraction layer
        return phy_mii_ioctl(port->phydev, if_mii(req), cmd);
  }
  
        return phy_mii_ioctl(port->phydev, if_mii(req), cmd);
  }
  

-@@ -845,18 +891,30 @@ static void ixp4xx_get_drvinfo(struct ne
+@@ -848,18 +894,30 @@ static void ixp4xx_get_drvinfo(struct ne

  static int ixp4xx_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
  {
        struct port *port = netdev_priv(dev);
  static int ixp4xx_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
  {
        struct port *port = netdev_priv(dev);