| .. | .. |
|---|
| 12 | 12 | |
|---|
| 13 | 13 | TRACE_EVENT(fib6_table_lookup, |
|---|
| 14 | 14 | |
|---|
| 15 | | - TP_PROTO(const struct net *net, const struct fib6_info *f6i, |
|---|
| 15 | + TP_PROTO(const struct net *net, const struct fib6_result *res, |
|---|
| 16 | 16 | struct fib6_table *table, const struct flowi6 *flp), |
|---|
| 17 | 17 | |
|---|
| 18 | | - TP_ARGS(net, f6i, table, flp), |
|---|
| 18 | + TP_ARGS(net, res, table, flp), |
|---|
| 19 | 19 | |
|---|
| 20 | 20 | TP_STRUCT__entry( |
|---|
| 21 | 21 | __field( u32, tb_id ) |
|---|
| .. | .. |
|---|
| 39 | 39 | struct in6_addr *in6; |
|---|
| 40 | 40 | |
|---|
| 41 | 41 | __entry->tb_id = table->tb6_id; |
|---|
| 42 | | - __entry->err = ip6_rt_type_to_error(f6i->fib6_type); |
|---|
| 42 | + __entry->err = ip6_rt_type_to_error(res->fib6_type); |
|---|
| 43 | 43 | __entry->oif = flp->flowi6_oif; |
|---|
| 44 | 44 | __entry->iif = flp->flowi6_iif; |
|---|
| 45 | 45 | __entry->tos = ip6_tclass(flp->flowlabel); |
|---|
| .. | .. |
|---|
| 62 | 62 | __entry->dport = 0; |
|---|
| 63 | 63 | } |
|---|
| 64 | 64 | |
|---|
| 65 | | - if (f6i->fib6_nh.nh_dev) { |
|---|
| 66 | | - __assign_str(name, f6i->fib6_nh.nh_dev); |
|---|
| 65 | + if (res->nh && res->nh->fib_nh_dev) { |
|---|
| 66 | + __assign_str(name, res->nh->fib_nh_dev); |
|---|
| 67 | 67 | } else { |
|---|
| 68 | 68 | __assign_str(name, "-"); |
|---|
| 69 | 69 | } |
|---|
| 70 | | - if (f6i == net->ipv6.fib6_null_entry) { |
|---|
| 70 | + if (res->f6i == net->ipv6.fib6_null_entry) { |
|---|
| 71 | 71 | struct in6_addr in6_zero = {}; |
|---|
| 72 | 72 | |
|---|
| 73 | 73 | in6 = (struct in6_addr *)__entry->gw; |
|---|
| 74 | 74 | *in6 = in6_zero; |
|---|
| 75 | 75 | |
|---|
| 76 | | - } else if (f6i) { |
|---|
| 76 | + } else if (res->nh) { |
|---|
| 77 | 77 | in6 = (struct in6_addr *)__entry->gw; |
|---|
| 78 | | - *in6 = f6i->fib6_nh.nh_gw; |
|---|
| 78 | + *in6 = res->nh->fib_nh_gw6; |
|---|
| 79 | 79 | } |
|---|
| 80 | 80 | ), |
|---|
| 81 | 81 | |
|---|