| Message ID | 20200907220408.32385-4-paul.davey@alliedtelesis.co.nz |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | Allow more than 255 IPv4 multicast interfaces | expand |
On Tue, Sep 08, 2020 at 10:04:08AM +1200, Paul Davey wrote: > Insert the full 16 bit VIF ID into ipmr Netlink cache reports. > > The VIF_ID attribute has 32 bits of space so can store the full VIF ID > extracted from the high and low byte fields in the igmpmsg. > > Signed-off-by: Paul Davey <paul.davey@alliedtelesis.co.nz> > --- > net/ipv4/ipmr.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c > index 4809318f591b..939792a38814 100644 > --- a/net/ipv4/ipmr.c > +++ b/net/ipv4/ipmr.c > @@ -2432,7 +2432,7 @@ static void igmpmsg_netlink_event(struct mr_table *mrt, struct sk_buff *pkt) > rtgenm = nlmsg_data(nlh); > rtgenm->rtgen_family = RTNL_FAMILY_IPMR; > if (nla_put_u8(skb, IPMRA_CREPORT_MSGTYPE, msg->im_msgtype) || > - nla_put_u32(skb, IPMRA_CREPORT_VIF_ID, msg->im_vif) || > + nla_put_u32(skb, IPMRA_CREPORT_VIF_ID, msg->im_vif | (msg->im_vif_hi << 8)) || nit: the inner parentheses seem unnecessary Otherwise, FWIIW, this series looks good to me. > nla_put_in_addr(skb, IPMRA_CREPORT_SRC_ADDR, > msg->im_src.s_addr) || > nla_put_in_addr(skb, IPMRA_CREPORT_DST_ADDR, > -- > 2.28.0 >
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 4809318f591b..939792a38814 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -2432,7 +2432,7 @@ static void igmpmsg_netlink_event(struct mr_table *mrt, struct sk_buff *pkt) rtgenm = nlmsg_data(nlh); rtgenm->rtgen_family = RTNL_FAMILY_IPMR; if (nla_put_u8(skb, IPMRA_CREPORT_MSGTYPE, msg->im_msgtype) || - nla_put_u32(skb, IPMRA_CREPORT_VIF_ID, msg->im_vif) || + nla_put_u32(skb, IPMRA_CREPORT_VIF_ID, msg->im_vif | (msg->im_vif_hi << 8)) || nla_put_in_addr(skb, IPMRA_CREPORT_SRC_ADDR, msg->im_src.s_addr) || nla_put_in_addr(skb, IPMRA_CREPORT_DST_ADDR,
Insert the full 16 bit VIF ID into ipmr Netlink cache reports. The VIF_ID attribute has 32 bits of space so can store the full VIF ID extracted from the high and low byte fields in the igmpmsg. Signed-off-by: Paul Davey <paul.davey@alliedtelesis.co.nz> --- net/ipv4/ipmr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)