diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-21 11:44:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-21 11:44:04 -0700 |
| commit | dc25b25897289bad4907f30151ffe5baf75ff369 (patch) | |
| tree | c99301de2cdf66d7af48fc43b6161bda6faaae70 /net/ipv6/ip6_fib.c | |
| parent | 1a69205c471221a7f9101df164642611e37c52e4 (diff) | |
| parent | 0bad90985d39e69ca035fdd70bcc743812641d18 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/qmi_wwan.c
Overlapping additions of new device IDs to qmi_wwan.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_fib.c')
| -rw-r--r-- | net/ipv6/ip6_fib.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 865e777ae20c..418d9823692b 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -173,6 +173,8 @@ static void rt6_free_pcpu(struct rt6_info *non_pcpu_rt) *ppcpu_rt = NULL; } } + + non_pcpu_rt->rt6i_pcpu = NULL; } static void rt6_release(struct rt6_info *rt) |