Merge branch 'tunnels'
authorDavid S. Miller <davem@davemloft.net>
Sat, 12 Apr 2014 21:03:20 +0000 (17:03 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 12 Apr 2014 21:03:20 +0000 (17:03 -0400)
commiteda43ce03919f2b929a884fddbefa98cfb04fec9
treef48369e48fdf6aec5d1916537e6f08574e0526d0
parent810d8cedcc880dca8b64e05fe1331ab5d4f8d992
parent8d89dcdf80d88007647945a753821a06eb6cc5a5
Merge branch 'tunnels'

Nicolas Dichtel says:

====================
tunnels: don't allow to add the same tunnel twice

This series fixes the check of an existing tunnel with the same
parameters when a new tunnel is added.  I've checked all users of
ip_tunnel_newlink(): gre, gretap, ipip and vti. The bug exists only
for gre and vti.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>