openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: switchdev: change fdb addr for a byte array 

The address in the switchdev_obj_fdb structure is currently represented
as a pointer. Replacing it for a 6-byte array allows switchdev to carry
addresses directly read from hardware registers, not stored by the
switch chip driver (as in Rocker).

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vivien Didelot 2015-08-06 01:44:02 -04:00 committed by David S. Miller
parent 4933d85c51
commit 1525c386a1
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/rocker/rocker.c
View File

@ -4543,7 +4543,7 @@ static int rocker_port_fdb_dump(const struct rocker_port *rocker_port,
hash_for_each_safe(rocker->fdb_tbl, bkt, tmp, found, entry) { hash_for_each_safe(rocker->fdb_tbl, bkt, tmp, found, entry) {
if (found->key.pport != rocker_port->pport) if (found->key.pport != rocker_port->pport)
continue; continue;
fdb->addr = found->key.addr; ether_addr_copy(fdb->addr, found->key.addr);
fdb->vid = rocker_port_vlan_to_vid(rocker_port, fdb->vid = rocker_port_vlan_to_vid(rocker_port,
found->key.vlan_id); found->key.vlan_id);
err = obj->cb(rocker_port->dev, obj); err = obj->cb(rocker_port->dev, obj);

2
include/net/switchdev.h
View File

@ -70,7 +70,7 @@ struct switchdev_obj {
u32 tb_id; u32 tb_id;
} ipv4_fib; } ipv4_fib;
struct switchdev_obj_fdb { /* PORT_FDB */ struct switchdev_obj_fdb { /* PORT_FDB */
const unsigned char *addr; u8 addr[ETH_ALEN];
u16 vid; u16 vid;
} fdb; } fdb;
} u; } u;

2
net/bridge/br_fdb.c
View File

@ -136,11 +136,11 @@ static void fdb_del_external_learn(struct net_bridge_fdb_entry *f)
struct switchdev_obj obj = { struct switchdev_obj obj = {
.id = SWITCHDEV_OBJ_PORT_FDB, .id = SWITCHDEV_OBJ_PORT_FDB,
.u.fdb = { .u.fdb = {
.addr = f->addr.addr,
.vid = f->vlan_id, .vid = f->vlan_id,
}, },
}; };
ether_addr_copy(obj.u.fdb.addr, f->addr.addr);
switchdev_port_obj_del(f->dst->dev, &obj); switchdev_port_obj_del(f->dst->dev, &obj);
} }

5
net/switchdev/switchdev.c
View File

@ -15,6 +15,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/if_bridge.h> #include <linux/if_bridge.h>
#include <net/ip_fib.h> #include <net/ip_fib.h>
#include <net/switchdev.h> #include <net/switchdev.h>
@ -742,11 +743,11 @@ int switchdev_port_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
struct switchdev_obj obj = { struct switchdev_obj obj = {
.id = SWITCHDEV_OBJ_PORT_FDB, .id = SWITCHDEV_OBJ_PORT_FDB,
.u.fdb = { .u.fdb = {
.addr = addr,
.vid = vid, .vid = vid,
}, },
}; };
ether_addr_copy(obj.u.fdb.addr, addr);
return switchdev_port_obj_add(dev, &obj); return switchdev_port_obj_add(dev, &obj);
} }
EXPORT_SYMBOL_GPL(switchdev_port_fdb_add); EXPORT_SYMBOL_GPL(switchdev_port_fdb_add);
@ -769,11 +770,11 @@ int switchdev_port_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
struct switchdev_obj obj = { struct switchdev_obj obj = {
.id = SWITCHDEV_OBJ_PORT_FDB, .id = SWITCHDEV_OBJ_PORT_FDB,
.u.fdb = { .u.fdb = {
.addr = addr,
.vid = vid, .vid = vid,
}, },
}; };
ether_addr_copy(obj.u.fdb.addr, addr);
return switchdev_port_obj_del(dev, &obj); return switchdev_port_obj_del(dev, &obj);
} }
EXPORT_SYMBOL_GPL(switchdev_port_fdb_del); EXPORT_SYMBOL_GPL(switchdev_port_fdb_del);