]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit189084ac017a05648ffbe55103f5f0bc10b6260f
treef48369e48fdf6aec5d1916537e6f08574e0526d0
parentcd0a0b91877c4df19c457e84882ab0996a735e07
parentfd1ee69a94745b61487f07fcda3ac71f704f3ff0
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>