aboutsummaryrefslogtreecommitdiffstats
path: root/net/dsa
diff options
context:
space:
mode:
authorScott Feldman <sfeldma@gmail.com>2015-05-13 18:16:50 (GMT)
committerDavid S. Miller <davem@davemloft.net>2015-05-13 18:20:59 (GMT)
commit42275bd8fcb351f951781d8882f359d25976824b (patch)
tree9689357f34d19a10544b03047df26b2031364664 /net/dsa
parent1f7bd29bc0559aedae857639ca391c815e47f1d9 (diff)
switchdev: don't use anonymous union on switchdev attr/obj structs
Older gcc versions (e.g. gcc version 4.4.6) don't like anonymous unions which was causing build issues on the newly added switchdev attr/obj structs. Fix this by using named union on structs. Signed-off-by: Scott Feldman <sfeldma@gmail.com> Reported-by: Or Gerlitz <ogerlitz@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
-rw-r--r--net/dsa/slave.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 3fb5210..04ffad3 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -353,7 +353,7 @@ static int dsa_slave_port_attr_set(struct net_device *dev,
switch (attr->id) {
case SWITCHDEV_ATTR_PORT_STP_STATE:
if (attr->trans == SWITCHDEV_TRANS_COMMIT)
- ret = dsa_slave_stp_update(dev, attr->stp_state);
+ ret = dsa_slave_stp_update(dev, attr->u.stp_state);
break;
default:
ret = -EOPNOTSUPP;
@@ -408,8 +408,8 @@ static int dsa_slave_port_attr_get(struct net_device *dev,
switch (attr->id) {
case SWITCHDEV_ATTR_PORT_PARENT_ID:
- attr->ppid.id_len = sizeof(ds->index);
- memcpy(&attr->ppid.id, &ds->index, attr->ppid.id_len);
+ attr->u.ppid.id_len = sizeof(ds->index);
+ memcpy(&attr->u.ppid.id, &ds->index, attr->u.ppid.id_len);
break;
default:
return -EOPNOTSUPP;

Privacy Policy