aboutsummaryrefslogtreecommitdiffstats
path: root/net/dsa/slave.c
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2016-06-04 15:16:57 -0400
committerDavid S. Miller <davem@davemloft.net>2016-06-04 17:29:53 -0400
commitc8b098086b4c744084350d2757a637ad756adf34 (patch)
tree0777d99335eff8adf732bd1cb574926b87f9d6c2 /net/dsa/slave.c
parent149cafd790573294752787f5ce1dc0f99e4088d3 (diff)
net: dsa: Add a ports structure and use it in the switch structure
There are going to be more per-port members added to the switch structure. So add a port structure and move the netdev into it. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/slave.c')
-rw-r--r--net/dsa/slave.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index f640a48a6ff3..169abacbc6ce 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1183,12 +1183,12 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
1183 p->old_link = -1; 1183 p->old_link = -1;
1184 p->old_duplex = -1; 1184 p->old_duplex = -1;
1185 1185
1186 ds->ports[port] = slave_dev; 1186 ds->ports[port].netdev = slave_dev;
1187 ret = register_netdev(slave_dev); 1187 ret = register_netdev(slave_dev);
1188 if (ret) { 1188 if (ret) {
1189 netdev_err(master, "error %d registering interface %s\n", 1189 netdev_err(master, "error %d registering interface %s\n",
1190 ret, slave_dev->name); 1190 ret, slave_dev->name);
1191 ds->ports[port] = NULL; 1191 ds->ports[port].netdev = NULL;
1192 free_netdev(slave_dev); 1192 free_netdev(slave_dev);
1193 return ret; 1193 return ret;
1194 } 1194 }