iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipv4: Allocate fib metrics dynamically.

Browse Source 
This is the initial gateway towards super-sharing metrics
if they are all set to zero for a route.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2011-01-28 14:01:25 -08:00
parent a4daad6b09
commit 9c150e82ac
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/ip_fib.h
View File

@ -77,7 +77,7 @@ struct fib_info {
int fib_protocol; int fib_protocol;
__be32 fib_prefsrc; __be32 fib_prefsrc;
u32 fib_priority; u32 fib_priority;
u32 fib_metrics[RTAX_MAX]; u32 *fib_metrics;
#define fib_mtu fib_metrics[RTAX_MTU-1] #define fib_mtu fib_metrics[RTAX_MTU-1]
#define fib_window fib_metrics[RTAX_WINDOW-1] #define fib_window fib_metrics[RTAX_WINDOW-1]
#define fib_rtt fib_metrics[RTAX_RTT-1] #define fib_rtt fib_metrics[RTAX_RTT-1]

4
net/ipv4/fib_semantics.c
View File

@ -152,6 +152,7 @@ static void free_fib_info_rcu(struct rcu_head *head)
{ {
struct fib_info *fi = container_of(head, struct fib_info, rcu); struct fib_info *fi = container_of(head, struct fib_info, rcu);
kfree(fi->fib_metrics);
kfree(fi); kfree(fi);
} }
@ -742,6 +743,9 @@ struct fib_info *fib_create_info(struct fib_config *cfg)
fi = kzalloc(sizeof(*fi)+nhs*sizeof(struct fib_nh), GFP_KERNEL); fi = kzalloc(sizeof(*fi)+nhs*sizeof(struct fib_nh), GFP_KERNEL);
if (fi == NULL) if (fi == NULL)
goto failure; goto failure;
fi->fib_metrics = kzalloc(sizeof(u32) * RTAX_MAX, GFP_KERNEL);
if (!fi->fib_metrics)
goto failure;
fib_info_cnt++; fib_info_cnt++;
fi->fib_net = hold_net(net); fi->fib_net = hold_net(net);