Make the struct name in sync with object id name.
Unified · Split
| @@ -4425,7 +4425,7 @@ static int rocker_port_vlans_add(struct rocker_port *rocker_port, · 4424 unmodified lines | |||
| 4425 | 4425 | ||
| 4426 | static int rocker_port_fdb_add(struct rocker_port *rocker_port, | 4426 | static int rocker_port_fdb_add(struct rocker_port *rocker_port, |
| 4427 | struct switchdev_trans *trans, | 4427 | struct switchdev_trans *trans, |
| 4428 | const struct switchdev_obj_fdb *fdb) | 4428 | const struct switchdev_obj_port_fdb *fdb) |
| 4429 | { | 4429 | { |
| 4430 | __be16 vlan_id = rocker_port_vid_to_vlan(rocker_port, fdb->vid, NULL); | 4430 | __be16 vlan_id = rocker_port_vid_to_vlan(rocker_port, fdb->vid, NULL); |
| 4431 | int flags = 0; | 4431 | int flags = 0; |
| @@ -4496,7 +4496,7 @@ static int rocker_port_vlans_del(struct rocker_port *rocker_port, · 64 unmodified lines | |||
| 4496 | 4496 | ||
| 4497 | static int rocker_port_fdb_del(struct rocker_port *rocker_port, | 4497 | static int rocker_port_fdb_del(struct rocker_port *rocker_port, |
| 4498 | struct switchdev_trans *trans, | 4498 | struct switchdev_trans *trans, |
| 4499 | const struct switchdev_obj_fdb *fdb) | 4499 | const struct switchdev_obj_port_fdb *fdb) |
| 4500 | { | 4500 | { |
| 4501 | __be16 vlan_id = rocker_port_vid_to_vlan(rocker_port, fdb->vid, NULL); | 4501 | __be16 vlan_id = rocker_port_vid_to_vlan(rocker_port, fdb->vid, NULL); |
| 4502 | int flags = ROCKER_OP_FLAG_NOWAIT | ROCKER_OP_FLAG_REMOVE; | 4502 | int flags = ROCKER_OP_FLAG_NOWAIT | ROCKER_OP_FLAG_REMOVE; |
| @@ -4537,7 +4537,7 @@ static int rocker_port_obj_del(struct net_device *dev, · 34 unmodified lines | |||
| 4537 | } | 4537 | } |
| 4538 | 4538 | ||
| 4539 | static int rocker_port_fdb_dump(const struct rocker_port *rocker_port, | 4539 | static int rocker_port_fdb_dump(const struct rocker_port *rocker_port, |
| 4540 | struct switchdev_obj_fdb *fdb, | 4540 | struct switchdev_obj_port_fdb *fdb, |
| 4541 | int (*cb)(void *obj)) | 4541 | int (*cb)(void *obj)) |
| 4542 | { | 4542 | { |
| 4543 | struct rocker *rocker = rocker_port->rocker; | 4543 | struct rocker *rocker = rocker_port->rocker; |
| @@ -83,7 +83,7 @@ struct switchdev_obj_ipv4_fib { · 82 unmodified lines | |||
| 83 | }; | 83 | }; |
| 84 | 84 | ||
| 85 | /* SWITCHDEV_OBJ_ID_PORT_FDB */ | 85 | /* SWITCHDEV_OBJ_ID_PORT_FDB */ |
| 86 | struct switchdev_obj_fdb { | 86 | struct switchdev_obj_port_fdb { |
| 87 | const unsigned char *addr; | 87 | const unsigned char *addr; |
| 88 | u16 vid; | 88 | u16 vid; |
| 89 | u16 ndm_state; | 89 | u16 ndm_state; |
| @@ -133,7 +133,7 @@ static void fdb_del_hw_addr(struct net_bridge *br, const unsigned char *addr) · 132 unmodified lines | |||
| 133 | 133 | ||
| 134 | static void fdb_del_external_learn(struct net_bridge_fdb_entry *f) | 134 | static void fdb_del_external_learn(struct net_bridge_fdb_entry *f) |
| 135 | { | 135 | { |
| 136 | struct switchdev_obj_fdb fdb = { | 136 | struct switchdev_obj_port_fdb fdb = { |
| 137 | .addr = f->addr.addr, | 137 | .addr = f->addr.addr, |
| 138 | .vid = f->vlan_id, | 138 | .vid = f->vlan_id, |
| 139 | }; | 139 | }; |
| @@ -341,7 +341,7 @@ static int dsa_slave_port_vlan_dump(struct net_device *dev, · 340 unmodified lines | |||
| 341 | } | 341 | } |
| 342 | 342 | ||
| 343 | static int dsa_slave_port_fdb_add(struct net_device *dev, | 343 | static int dsa_slave_port_fdb_add(struct net_device *dev, |
| 344 | const struct switchdev_obj_fdb *fdb, | 344 | const struct switchdev_obj_port_fdb *fdb, |
| 345 | struct switchdev_trans *trans) | 345 | struct switchdev_trans *trans) |
| 346 | { | 346 | { |
| 347 | struct dsa_slave_priv *p = netdev_priv(dev); | 347 | struct dsa_slave_priv *p = netdev_priv(dev); |
| @@ -357,7 +357,7 @@ static int dsa_slave_port_fdb_add(struct net_device *dev, · 9 unmodified lines | |||
| 357 | } | 357 | } |
| 358 | 358 | ||
| 359 | static int dsa_slave_port_fdb_del(struct net_device *dev, | 359 | static int dsa_slave_port_fdb_del(struct net_device *dev, |
| 360 | const struct switchdev_obj_fdb *fdb) | 360 | const struct switchdev_obj_port_fdb *fdb) |
| 361 | { | 361 | { |
| 362 | struct dsa_slave_priv *p = netdev_priv(dev); | 362 | struct dsa_slave_priv *p = netdev_priv(dev); |
| 363 | struct dsa_switch *ds = p->parent; | 363 | struct dsa_switch *ds = p->parent; |
| @@ -370,7 +370,7 @@ static int dsa_slave_port_fdb_del(struct net_device *dev, · 6 unmodified lines | |||
| 370 | } | 370 | } |
| 371 | 371 | ||
| 372 | static int dsa_slave_port_fdb_dump(struct net_device *dev, | 372 | static int dsa_slave_port_fdb_dump(struct net_device *dev, |
| 373 | struct switchdev_obj_fdb *fdb, | 373 | struct switchdev_obj_port_fdb *fdb, |
| 374 | int (*cb)(void *obj)) | 374 | int (*cb)(void *obj)) |
| 375 | { | 375 | { |
| 376 | struct dsa_slave_priv *p = netdev_priv(dev); | 376 | struct dsa_slave_priv *p = netdev_priv(dev); |
| @@ -819,7 +819,7 @@ int switchdev_port_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], · 818 unmodified lines | |||
| 819 | struct net_device *dev, const unsigned char *addr, | 819 | struct net_device *dev, const unsigned char *addr, |
| 820 | u16 vid, u16 nlm_flags) | 820 | u16 vid, u16 nlm_flags) |
| 821 | { | 821 | { |
| 822 | struct switchdev_obj_fdb fdb = { | 822 | struct switchdev_obj_port_fdb fdb = { |
| 823 | .addr = addr, | 823 | .addr = addr, |
| 824 | .vid = vid, | 824 | .vid = vid, |
| 825 | }; | 825 | }; |
| @@ -843,7 +843,7 @@ int switchdev_port_fdb_del(struct ndmsg *ndm, struct nlattr *tb[], · 17 unmodified lines | |||
| 843 | struct net_device *dev, const unsigned char *addr, | 843 | struct net_device *dev, const unsigned char *addr, |
| 844 | u16 vid) | 844 | u16 vid) |
| 845 | { | 845 | { |
| 846 | struct switchdev_obj_fdb fdb = { | 846 | struct switchdev_obj_port_fdb fdb = { |
| 847 | .addr = addr, | 847 | .addr = addr, |
| 848 | .vid = vid, | 848 | .vid = vid, |
| 849 | }; | 849 | }; |
| @@ -853,7 +853,7 @@ int switchdev_port_fdb_del(struct ndmsg *ndm, struct nlattr *tb[], · 3 unmodified lines | |||
| 853 | EXPORT_SYMBOL_GPL(switchdev_port_fdb_del); | 853 | EXPORT_SYMBOL_GPL(switchdev_port_fdb_del); |
| 854 | 854 | ||
| 855 | struct switchdev_fdb_dump { | 855 | struct switchdev_fdb_dump { |
| 856 | struct switchdev_obj_fdb fdb; | 856 | struct switchdev_obj_port_fdb fdb; |
| 857 | struct net_device *dev; | 857 | struct net_device *dev; |
| 858 | struct sk_buff *skb; | 858 | struct sk_buff *skb; |
| 859 | struct netlink_callback *cb; | 859 | struct netlink_callback *cb; |
| @@ -862,7 +862,7 @@ struct switchdev_fdb_dump { · 2 unmodified lines | |||
| 862 | 862 | ||
| 863 | static int switchdev_port_fdb_dump_cb(void *obj) | 863 | static int switchdev_port_fdb_dump_cb(void *obj) |
| 864 | { | 864 | { |
| 865 | struct switchdev_obj_fdb *fdb = obj; | 865 | struct switchdev_obj_port_fdb *fdb = obj; |
| 866 | struct switchdev_fdb_dump *dump = | 866 | struct switchdev_fdb_dump *dump = |
| 867 | container_of(fdb, struct switchdev_fdb_dump, fdb); | 867 | container_of(fdb, struct switchdev_fdb_dump, fdb); |
| 868 | u32 portid = NETLINK_CB(dump->cb->skb).portid; | 868 | u32 portid = NETLINK_CB(dump->cb->skb).portid; |