1 files changed, 53 insertions, 38 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index c92f3d6a8f13..8a8895ef09a7 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1299,52 +1299,67 @@ static void addrconf_leave_anycast(struct inet6_ifaddr *ifp)
         __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)
 {
         switch (dev->type) {
         case ARPHRD_ETHER:
         case ARPHRD_FDDI:
         case ARPHRD_IEEE802_TR:
-                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;
+                return addrconf_ifid_eui48(eui, dev);
         case ARPHRD_ARCNET:
-                /* 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;
+                return addrconf_ifid_arcnet(eui, dev);
         case ARPHRD_INFINIBAND:
-                if (dev->addr_len != INFINIBAND_ALEN)
-                        return -1;
-                memcpy(eui, dev->dev_addr + 12, 8);
-                eui[0] |= 2;
-                return 0;
+                return addrconf_ifid_infiniband(eui, dev);
         }
         return -1;
 }