From: David S. Miller <davem@davemloft.net> Date: Sat, 12 Apr 2014 21:03:20 +0000 (-0400) Subject: Merge branch 'tunnels' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eda43ce03919f2b929a884fddbefa98cfb04fec9;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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> --- eda43ce03919f2b929a884fddbefa98cfb04fec9