[IPV6]: ADDRCONF: Split up ipv6_generate_eui64() by device type.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
955189efb4
commit
073a8e0e15
|
@ -1299,52 +1299,67 @@ static void addrconf_leave_anycast(struct inet6_ifaddr *ifp)
|
||||||
__ipv6_dev_ac_dec(ifp->idev, &addr);
|
__ipv6_dev_ac_dec(ifp->idev, &addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int addrconf_ifid_eui48(u8 *eui, struct net_device *dev)
|
||||||
|
{
|
||||||
|
if (dev->addr_len != ETH_ALEN)
|
||||||
|
return -1;
|
||||||
|
memcpy(eui, dev->dev_addr, 3);
|
||||||
|
memcpy(eui + 5, dev->dev_addr + 3, 3);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The zSeries OSA network cards can be shared among various
|
||||||
|
* OS instances, but the OSA cards have only one MAC address.
|
||||||
|
* This leads to duplicate address conflicts in conjunction
|
||||||
|
* with IPv6 if more than one instance uses the same card.
|
||||||
|
*
|
||||||
|
* The driver for these cards can deliver a unique 16-bit
|
||||||
|
* identifier for each instance sharing the same card. It is
|
||||||
|
* placed instead of 0xFFFE in the interface identifier. The
|
||||||
|
* "u" bit of the interface identifier is not inverted in this
|
||||||
|
* case. Hence the resulting interface identifier has local
|
||||||
|
* scope according to RFC2373.
|
||||||
|
*/
|
||||||
|
if (dev->dev_id) {
|
||||||
|
eui[3] = (dev->dev_id >> 8) & 0xFF;
|
||||||
|
eui[4] = dev->dev_id & 0xFF;
|
||||||
|
} else {
|
||||||
|
eui[3] = 0xFF;
|
||||||
|
eui[4] = 0xFE;
|
||||||
|
eui[0] ^= 2;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int addrconf_ifid_arcnet(u8 *eui, struct net_device *dev)
|
||||||
|
{
|
||||||
|
/* XXX: inherit EUI-64 from other interface -- yoshfuji */
|
||||||
|
if (dev->addr_len != ARCNET_ALEN)
|
||||||
|
return -1;
|
||||||
|
memset(eui, 0, 7);
|
||||||
|
eui[7] = *(u8*)dev->dev_addr;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int addrconf_ifid_infiniband(u8 *eui, struct net_device *dev)
|
||||||
|
{
|
||||||
|
if (dev->addr_len != INFINIBAND_ALEN)
|
||||||
|
return -1;
|
||||||
|
memcpy(eui, dev->dev_addr + 12, 8);
|
||||||
|
eui[0] |= 2;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static int ipv6_generate_eui64(u8 *eui, struct net_device *dev)
|
static int ipv6_generate_eui64(u8 *eui, struct net_device *dev)
|
||||||
{
|
{
|
||||||
switch (dev->type) {
|
switch (dev->type) {
|
||||||
case ARPHRD_ETHER:
|
case ARPHRD_ETHER:
|
||||||
case ARPHRD_FDDI:
|
case ARPHRD_FDDI:
|
||||||
case ARPHRD_IEEE802_TR:
|
case ARPHRD_IEEE802_TR:
|
||||||
if (dev->addr_len != ETH_ALEN)
|
return addrconf_ifid_eui48(eui, dev);
|
||||||
return -1;
|
|
||||||
memcpy(eui, dev->dev_addr, 3);
|
|
||||||
memcpy(eui + 5, dev->dev_addr + 3, 3);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* The zSeries OSA network cards can be shared among various
|
|
||||||
* OS instances, but the OSA cards have only one MAC address.
|
|
||||||
* This leads to duplicate address conflicts in conjunction
|
|
||||||
* with IPv6 if more than one instance uses the same card.
|
|
||||||
*
|
|
||||||
* The driver for these cards can deliver a unique 16-bit
|
|
||||||
* identifier for each instance sharing the same card. It is
|
|
||||||
* placed instead of 0xFFFE in the interface identifier. The
|
|
||||||
* "u" bit of the interface identifier is not inverted in this
|
|
||||||
* case. Hence the resulting interface identifier has local
|
|
||||||
* scope according to RFC2373.
|
|
||||||
*/
|
|
||||||
if (dev->dev_id) {
|
|
||||||
eui[3] = (dev->dev_id >> 8) & 0xFF;
|
|
||||||
eui[4] = dev->dev_id & 0xFF;
|
|
||||||
} else {
|
|
||||||
eui[3] = 0xFF;
|
|
||||||
eui[4] = 0xFE;
|
|
||||||
eui[0] ^= 2;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
case ARPHRD_ARCNET:
|
case ARPHRD_ARCNET:
|
||||||
/* XXX: inherit EUI-64 from other interface -- yoshfuji */
|
return addrconf_ifid_arcnet(eui, dev);
|
||||||
if (dev->addr_len != ARCNET_ALEN)
|
|
||||||
return -1;
|
|
||||||
memset(eui, 0, 7);
|
|
||||||
eui[7] = *(u8*)dev->dev_addr;
|
|
||||||
return 0;
|
|
||||||
case ARPHRD_INFINIBAND:
|
case ARPHRD_INFINIBAND:
|
||||||
if (dev->addr_len != INFINIBAND_ALEN)
|
return addrconf_ifid_infiniband(eui, dev);
|
||||||
return -1;
|
|
||||||
memcpy(eui, dev->dev_addr + 12, 8);
|
|
||||||
eui[0] |= 2;
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue