| Message ID | 1436397403-62412-3-git-send-email-sfeldma@gmail.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
Hello. On 7/9/2015 2:16 AM, sfeldma@gmail.com wrote: > From: Scott Feldman <sfeldma@gmail.com> > Signed-off-by: Scott Feldman <sfeldma@gmail.com> > --- > include/linux/netdevice.h | 7 +++++++ > net/switchdev/switchdev.c | 8 ++------ > 2 files changed, 9 insertions(+), 6 deletions(-) [...] > diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c > index 84f77a0..e16586f 100644 > --- a/net/switchdev/switchdev.c > +++ b/net/switchdev/switchdev.c > @@ -906,13 +906,9 @@ static struct net_device *switchdev_get_dev_by_nhs(struct fib_info *fi) > if (switchdev_port_attr_get(dev, &attr)) > return NULL; > > - if (nhsel > 0) { > - if (prev_attr.u.ppid.id_len != attr.u.ppid.id_len) > + if (nhsel > 0 && > + !netdev_phys_item_id_same(&prev_attr.u.ppid, &attr.u.ppid)) > return NULL; This line should be re-indented now, it starts too far to the right. [...] WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 7be616e1..89db412 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -766,6 +766,13 @@ struct netdev_phys_item_id { 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, struct sk_buff *skb); diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 84f77a0..e16586f 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -906,13 +906,9 @@ static struct net_device *switchdev_get_dev_by_nhs(struct fib_info *fi) if (switchdev_port_attr_get(dev, &attr)) return NULL; - if (nhsel > 0) { - if (prev_attr.u.ppid.id_len != attr.u.ppid.id_len) + if (nhsel > 0 && + !netdev_phys_item_id_same(&prev_attr.u.ppid, &attr.u.ppid)) return NULL; - if (memcmp(prev_attr.u.ppid.id, attr.u.ppid.id, - attr.u.ppid.id_len)) - return NULL; - } prev_attr = attr; }