OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 247... Line 247...
247 return p->dp->cpu_dp->netdev; 247 return p->dp->cpu_dp->netdev;
248 } 248 }
Line 249... Line 249...
249 249
250 --- a/net/dsa/slave.c 250 --- a/net/dsa/slave.c
251 +++ b/net/dsa/slave.c 251 +++ b/net/dsa/slave.c
252 @@ -1267,7 +1267,7 @@ int dsa_slave_create(struct dsa_port *po 252 @@ -1263,7 +1263,7 @@ int dsa_slave_create(struct dsa_port *po
Line 253... Line 253...
253 int ret; 253 int ret;
254 254
255 cpu_dp = ds->dst->cpu_dp; 255 cpu_dp = ds->dst->cpu_dp;
Line 256... Line 256...
256 - master = cpu_dp->netdev; 256 - master = cpu_dp->netdev;
257 + master = ds->ports[port->upstream].ethernet; 257 + master = ds->ports[port->upstream].ethernet;
258 258
259 if (!ds->num_tx_queues) 259 if (!ds->num_tx_queues)
260 ds->num_tx_queues = 1; 260 ds->num_tx_queues = 1;
261 @@ -1305,6 +1305,7 @@ int dsa_slave_create(struct dsa_port *po 261 @@ -1301,6 +1301,7 @@ int dsa_slave_create(struct dsa_port *po
262 p->dp = port; 262 p->dp = port;