Merge branch 'rtnetlink-avoid-a-warning-in-rtnl_newlink'
Jakub Kicinski says:
====================
rtnetlink: avoid a warning in rtnl_newlink()
I've been hoping for some time that someone more competent would fix
the stack frame size warning in rtnl_newlink(), but looks like I'll
have to take a stab at it myself :) That's the only warning I see
in most of my builds.
First patch refactors away a somewhat surprising if (1) code block.
Reindentation will most likely cause cherry-pick problems but OTOH
rtnl_newlink() doesn't seem to be changed often, so perhaps we can
risk it in the name of cleaner code?
Second patch fixes the warning in simplest possible way. I was
pondering if there is any more clever solution, but I can't see it..
rtnl_newlink() is quite long with a lot of possible execution paths
so doing memory allocations half way through leads to very ugly
results.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>