diff options
| author | David S. Miller <davem@davemloft.net> | 2017-05-26 20:46:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-26 20:46:35 -0400 |
| commit | 34aa83c2fc23e055968387c8b78ac8bafd735aff (patch) | |
| tree | a53a341d74613e512bf467ea12615f509cb53536 /include/net/ip_fib.h | |
| parent | 47936d35edbac5e58064bd15e51136050b2f2717 (diff) | |
| parent | e2a9aa5ab2a4d1fb05fcdfa9661d54e437093297 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Overlapping changes in drivers/net/phy/marvell.c, bug fix in 'net'
restricting a HW workaround alongside cleanups in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ip_fib.h')
| -rw-r--r-- | include/net/ip_fib.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index 25f5c516afd1..dcbfd5dfd25e 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h @@ -114,11 +114,11 @@ struct fib_info { __be32 fib_prefsrc; u32 fib_tb_id; u32 fib_priority; - u32 *fib_metrics; -#define fib_mtu fib_metrics[RTAX_MTU-1] -#define fib_window fib_metrics[RTAX_WINDOW-1] -#define fib_rtt fib_metrics[RTAX_RTT-1] -#define fib_advmss fib_metrics[RTAX_ADVMSS-1] + struct dst_metrics *fib_metrics; +#define fib_mtu fib_metrics->metrics[RTAX_MTU-1] +#define fib_window fib_metrics->metrics[RTAX_WINDOW-1] +#define fib_rtt fib_metrics->metrics[RTAX_RTT-1] +#define fib_advmss fib_metrics->metrics[RTAX_ADVMSS-1] int fib_nhs; #ifdef CONFIG_IP_ROUTE_MULTIPATH int fib_weight; |