net: drop the packet when fails to do software segmentation or header check

[uclinux-h8/linux.git] / net / dsa / slave.c

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index ab03e00..515569f 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -249,6 +249,27 @@ static void dsa_slave_get_drvinfo(struct net_device *dev,
        strlcpy(drvinfo->bus_info, "platform", sizeof(drvinfo->bus_info));
 }
 
+static int dsa_slave_get_regs_len(struct net_device *dev)
+{
+       struct dsa_slave_priv *p = netdev_priv(dev);
+       struct dsa_switch *ds = p->parent;
+
+       if (ds->drv->get_regs_len)
+               return ds->drv->get_regs_len(ds, p->port);
+
+       return -EOPNOTSUPP;
+}
+
+static void
+dsa_slave_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *_p)
+{
+       struct dsa_slave_priv *p = netdev_priv(dev);
+       struct dsa_switch *ds = p->parent;
+
+       if (ds->drv->get_regs)
+               ds->drv->get_regs(ds, p->port, regs, _p);
+}
+
 static int dsa_slave_nway_reset(struct net_device *dev)
 {
        struct dsa_slave_priv *p = netdev_priv(dev);
@@ -271,6 +292,44 @@ static u32 dsa_slave_get_link(struct net_device *dev)
        return -EOPNOTSUPP;
 }
 
+static int dsa_slave_get_eeprom_len(struct net_device *dev)
+{
+       struct dsa_slave_priv *p = netdev_priv(dev);
+       struct dsa_switch *ds = p->parent;
+
+       if (ds->pd->eeprom_len)
+               return ds->pd->eeprom_len;
+
+       if (ds->drv->get_eeprom_len)
+               return ds->drv->get_eeprom_len(ds);
+
+       return 0;
+}
+
+static int dsa_slave_get_eeprom(struct net_device *dev,
+                               struct ethtool_eeprom *eeprom, u8 *data)
+{
+       struct dsa_slave_priv *p = netdev_priv(dev);
+       struct dsa_switch *ds = p->parent;
+
+       if (ds->drv->get_eeprom)
+               return ds->drv->get_eeprom(ds, eeprom, data);
+
+       return -EOPNOTSUPP;
+}
+
+static int dsa_slave_set_eeprom(struct net_device *dev,
+                               struct ethtool_eeprom *eeprom, u8 *data)
+{
+       struct dsa_slave_priv *p = netdev_priv(dev);
+       struct dsa_switch *ds = p->parent;
+
+       if (ds->drv->set_eeprom)
+               return ds->drv->set_eeprom(ds, eeprom, data);
+
+       return -EOPNOTSUPP;
+}
+
 static void dsa_slave_get_strings(struct net_device *dev,
                                  uint32_t stringset, uint8_t *data)
 {
@@ -385,8 +444,13 @@ static const struct ethtool_ops dsa_slave_ethtool_ops = {
        .get_settings           = dsa_slave_get_settings,
        .set_settings           = dsa_slave_set_settings,
        .get_drvinfo            = dsa_slave_get_drvinfo,
+       .get_regs_len           = dsa_slave_get_regs_len,
+       .get_regs               = dsa_slave_get_regs,
        .nway_reset             = dsa_slave_nway_reset,
        .get_link               = dsa_slave_get_link,
+       .get_eeprom_len         = dsa_slave_get_eeprom_len,
+       .get_eeprom             = dsa_slave_get_eeprom,
+       .set_eeprom             = dsa_slave_set_eeprom,
        .get_strings            = dsa_slave_get_strings,
        .get_ethtool_stats      = dsa_slave_get_ethtool_stats,
        .get_sset_count         = dsa_slave_get_sset_count,
@@ -448,7 +512,7 @@ static int dsa_slave_fixed_link_update(struct net_device *dev,
 }
 
 /* slave device setup *******************************************************/
-static void dsa_slave_phy_setup(struct dsa_slave_priv *p,
+static int dsa_slave_phy_setup(struct dsa_slave_priv *p,
                                struct net_device *slave_dev)
 {
        struct dsa_switch *ds = p->parent;
@@ -468,8 +532,8 @@ static void dsa_slave_phy_setup(struct dsa_slave_priv *p,
                 */
                ret = of_phy_register_fixed_link(port_dn);
                if (ret) {
-                       pr_err("failed to register fixed PHY\n");
-                       return;
+                       netdev_err(slave_dev, "failed to register fixed PHY\n");
+                       return ret;
                }
                phy_is_fixed = true;
                phy_dn = port_dn;
@@ -491,12 +555,17 @@ static void dsa_slave_phy_setup(struct dsa_slave_priv *p,
         */
        if (!p->phy) {
                p->phy = ds->slave_mii_bus->phy_map[p->port];
+               if (!p->phy)
+                       return -ENODEV;
+
                phy_connect_direct(slave_dev, p->phy, dsa_slave_adjust_link,
                                   p->phy_interface);
        } else {
-               pr_info("attached PHY at address %d [%s]\n",
-                       p->phy->addr, p->phy->drv->name);
+               netdev_info(slave_dev, "attached PHY at address %d [%s]\n",
+                           p->phy->addr, p->phy->drv->name);
        }
+
+       return 0;
 }
 
 int dsa_slave_suspend(struct net_device *slave_dev)
@@ -589,12 +658,17 @@ dsa_slave_create(struct dsa_switch *ds, struct device *parent,
        p->old_link = -1;
        p->old_duplex = -1;
 
-       dsa_slave_phy_setup(p, slave_dev);
+       ret = dsa_slave_phy_setup(p, slave_dev);
+       if (ret) {
+               free_netdev(slave_dev);
+               return NULL;
+       }
 
        ret = register_netdev(slave_dev);
        if (ret) {
-               printk(KERN_ERR "%s: error %d registering interface %s\n",
-                               master->name, ret, slave_dev->name);
+               netdev_err(master, "error %d registering interface %s\n",
+                          ret, slave_dev->name);
+               phy_disconnect(p->phy);
                free_netdev(slave_dev);
                return NULL;
        }