|
@@ -1084,7 +1084,7 @@ static void ipip6_tunnel_bind_dev(struct net_device *dev)
|
|
|
if (!tdev && tunnel->parms.link)
|
|
if (!tdev && tunnel->parms.link)
|
|
|
tdev = __dev_get_by_index(tunnel->net, 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);
|
|
int t_hlen = tunnel->hlen + sizeof(struct iphdr);
|
|
|
|
|
|
|
|
dev->hard_header_len = tdev->hard_header_len + sizeof(struct iphdr);
|
|
dev->hard_header_len = tdev->hard_header_len + sizeof(struct iphdr);
|