Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Minor conflict with the DSA legacy code removal.

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

1 files changed, 1 insertions, 1 deletions

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index b2109b74857d..971d60bf9640 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -1084,7 +1084,7 @@ static void ipip6_tunnel_bind_dev(struct net_device *dev)
         if (!tdev && tunnel->parms.link)
                 tdev = __dev_get_by_index(tunnel->net, tunnel->parms.link);
 
-        if (tdev) {
+        if (tdev && !netif_is_l3_master(tdev)) {
                 int t_hlen = tunnel->hlen + sizeof(struct iphdr);
 
                 dev->hard_header_len = tdev->hard_header_len + sizeof(struct iphdr);