From: David S. Miller Date: Wed, 16 Nov 2016 18:24:51 +0000 (-0500) Subject: Merge branch 'fib-tables-fixes' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b71de936c38e80d1f059fd54d8704e9d86d6bd10;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'fib-tables-fixes' Alexander Duyck says: ==================== ipv4: Fix memory leaks and reference issues in fib This series fixes one major issue and one minor issue in the fib tables. The major issue is that we had lost the functionality that was flushing the local table entries from main after we had unmerged the two tries. In order to regain the functionality I have performed a partial revert and then moved the functionality for flushing the external entries from main into fib_unmerge. The minor issue was a memory leak that could occur in the event that we weren't able to add an alias to the local trie resulting in the fib alias being leaked. ==================== Signed-off-by: David S. Miller --- b71de936c38e80d1f059fd54d8704e9d86d6bd10