From 7ff5bd677821ff27df5d2c81b2e759f78f723812 Mon Sep 17 00:00:00 2001 From: Ursula Braun Date: Mon, 8 Oct 2007 20:28:47 -0700 Subject: [PATCH] --- yaml --- r: 66951 b: refs/heads/master c: 3607c44676583e80122c1fed23f34d003cdd6979 h: refs/heads/master i: 66949: 316f6967c00c7284c8dde18c60f2c4304dfdbe1f 66947: 9c86707441b07d655faeb2037a47e2d179af6bab 66943: 43fe09100968652dae22b1bc366df2dea510d833 v: v3 --- [refs] | 2 +- trunk/net/8021q/vlan.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f76c6a1e763e..d8da11f05bcb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45b17f48eaf5e5ff4202454985557b3240141caa +refs/heads/master: 3607c44676583e80122c1fed23f34d003cdd6979 diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c index f2bee234d361..3fe4fc86055f 100644 --- a/trunk/net/8021q/vlan.c +++ b/trunk/net/8021q/vlan.c @@ -331,6 +331,9 @@ static int vlan_dev_init(struct net_device *dev) (1<<__LINK_STATE_DORMANT))) | (1<<__LINK_STATE_PRESENT); + /* ipv6 shared card related stuff */ + dev->dev_id = real_dev->dev_id; + if (is_zero_ether_addr(dev->dev_addr)) memcpy(dev->dev_addr, real_dev->dev_addr, dev->addr_len); if (is_zero_ether_addr(dev->broadcast))