diff options
| author |   Paul Davey <paul.davey@alliedtelesis.co.nz> | 2020-09-08 10:04:08 +1200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-09-10 12:25:51 -0700 |
| commit | bb82067c574a36c7e1d6d552557cf5b112ed9751 (patch) | |
| tree | ca38527ae9fd864683c052e38d5a8f14cc8dfea5 /net/ipv4/ipmr.c | |
| parent | ipmr: Add high byte of VIF ID to igmpmsg (diff) | |
| download | linux-dev-bb82067c574a36c7e1d6d552557cf5b112ed9751.tar.xz linux-dev-bb82067c574a36c7e1d6d552557cf5b112ed9751.zip | |
ipmr: Use full VIF ID in netlink cache reports
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv4/ipmr.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, |