Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

To obtain new flag FLOWI_FLAG_KNOWN_NH to fix netfilter's xt_TEE target.

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/mpi/mpi-pow.c b/lib/mpi/mpi-pow.c
index 67f3e79af914..5464c8744ea9 100644
--- a/lib/mpi/mpi-pow.c
+++ b/lib/mpi/mpi-pow.c
@@ -77,7 +77,7 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod)
         mp = mp_marker = mpi_alloc_limb_space(msize);
         if (!mp)
                 goto enomem;
-        count_leading_zeros(mod_shift_cnt, mod->d[msize - 1]);
+        mod_shift_cnt = count_leading_zeros(mod->d[msize - 1]);
         if (mod_shift_cnt)
                 mpihelp_lshift(mp, mod->d, msize, mod_shift_cnt);
         else
@@ -169,7 +169,7 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod)
 
                 i = esize - 1;
                 e = ep[i];
-                count_leading_zeros(c, e);
+                c = count_leading_zeros(e);
                 e = (e << c) << 1;      /* shift the exp bits to the left, lose msb */
                 c = BITS_PER_MPI_LIMB - 1 - c;