|
| 1 | +net: ip6mr: add RTM_GETROUTE netlink op |
| 2 | + |
| 3 | +jira LE-2522 |
| 4 | +Rebuild_History Non-Buildable kernel-5.14.0-503.29.1.el9_5 |
| 5 | +commit-author David Lamparter < [email protected]> |
| 6 | +commit d7c31cbde4bc6756d1a11747d2b99bc627001c86 |
| 7 | +Empty-Commit: Cherry-Pick Conflicts during history rebuild. |
| 8 | +Will be included in final tarball splat. Ref for failed cherry-pick at: |
| 9 | +ciq/ciq_backports/kernel-5.14.0-503.29.1.el9_5/d7c31cbd.failed |
| 10 | + |
| 11 | +The IPv6 multicast routing code previously implemented only the dump |
| 12 | +variant of RTM_GETROUTE. Implement single MFC item retrieval by copying |
| 13 | +and adapting the respective IPv4 code. |
| 14 | + |
| 15 | +Tested against FRRouting's IPv6 PIM stack. |
| 16 | + |
| 17 | + Signed-off-by: David Lamparter < [email protected]> |
| 18 | + Reviewed-by: Nikolay Aleksandrov < [email protected]> |
| 19 | + Reviewed-by: David Ahern < [email protected]> |
| 20 | + Cc: Jakub Kicinski < [email protected]> |
| 21 | + Signed-off-by: David S. Miller < [email protected]> |
| 22 | +(cherry picked from commit d7c31cbde4bc6756d1a11747d2b99bc627001c86) |
| 23 | + Signed-off-by: Jonathan Maple < [email protected]> |
| 24 | + |
| 25 | +# Conflicts: |
| 26 | +# net/ipv6/ip6mr.c |
| 27 | +diff --cc net/ipv6/ip6mr.c |
| 28 | +index 82ffa9515d31,d546fc09d803..000000000000 |
| 29 | +--- a/net/ipv6/ip6mr.c |
| 30 | ++++ b/net/ipv6/ip6mr.c |
| 31 | +@@@ -89,7 -94,9 +89,13 @@@ static int ip6mr_cache_report(struct mr |
| 32 | + mifi_t mifi, int assert); |
| 33 | + static void mr6_netlink_event(struct mr_table *mrt, struct mfc6_cache *mfc, |
| 34 | + int cmd); |
| 35 | +++<<<<<<< HEAD |
| 36 | + +static void mrt6msg_netlink_event(struct mr_table *mrt, struct sk_buff *pkt); |
| 37 | +++======= |
| 38 | ++ static void mrt6msg_netlink_event(const struct mr_table *mrt, struct sk_buff *pkt); |
| 39 | ++ static int ip6mr_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, |
| 40 | ++ struct netlink_ext_ack *extack); |
| 41 | +++>>>>>>> d7c31cbde4bc (net: ip6mr: add RTM_GETROUTE netlink op) |
| 42 | + static int ip6mr_rtm_dumproute(struct sk_buff *skb, |
| 43 | + struct netlink_callback *cb); |
| 44 | + static void mroute_clean_tables(struct mr_table *mrt, int flags); |
| 45 | +* Unmerged path net/ipv6/ip6mr.c |
0 commit comments