hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: add phys ID compare helper to test if two IDs are the same 

Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Acked-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Scott Feldman 2015-07-18 18:24:49 -07:00 committed by David S. Miller
parent 0c4f691ff6
commit d754f98b50
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/netdevice.h
View File

@ -766,6 +766,13 @@ struct netdev_phys_item_id {
unsigned char id_len; unsigned char id_len;
}; };
static inline bool netdev_phys_item_id_same(struct netdev_phys_item_id *a,
struct netdev_phys_item_id *b)
{
return a->id_len == b->id_len &&
memcmp(a->id, b->id, a->id_len) == 0;
}
typedef u16 (*select_queue_fallback_t)(struct net_device *dev, typedef u16 (*select_queue_fallback_t)(struct net_device *dev,
struct sk_buff *skb); struct sk_buff *skb);

8
net/switchdev/switchdev.c
View File

@ -910,13 +910,9 @@ static struct net_device *switchdev_get_dev_by_nhs(struct fib_info *fi)
if (switchdev_port_attr_get(dev, &attr)) if (switchdev_port_attr_get(dev, &attr))
return NULL; return NULL;
if (nhsel > 0) { if (nhsel > 0 &&
if (prev_attr.u.ppid.id_len != attr.u.ppid.id_len) !netdev_phys_item_id_same(&prev_attr.u.ppid, &attr.u.ppid))
return NULL; return NULL;
if (memcmp(prev_attr.u.ppid.id, attr.u.ppid.id,
attr.u.ppid.id_len))
return NULL;
}
prev_attr = attr; prev_attr = attr;
} }