Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-block.git] / net / dsa / dsa2.c

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index b501c90aabe45e16741f17ff663917bc82464a2e..73002022c9d820df95b9df1841ce3724c4d41070 100644 (file)
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -644,6 +644,8 @@ static int dsa_port_parse_cpu(struct dsa_port *dp, struct net_device *master)
        tag_protocol = ds->ops->get_tag_protocol(ds, dp->index);
        tag_ops = dsa_tag_driver_get(tag_protocol);
        if (IS_ERR(tag_ops)) {
+               if (PTR_ERR(tag_ops) == -ENOPROTOOPT)
+                       return -EPROBE_DEFER;
                dev_warn(ds->dev, "No tagger for this switch\n");
                return PTR_ERR(tag_ops);
        }