- patches.arch/x86_mce_intel_decode_physical_address.patch:

[linux-flexiantxendom0-3.2.10.git] / drivers / net / bonding / bond_ipv6.c

diff --git a/drivers/net/bonding/bond_ipv6.c b/drivers/net/bonding/bond_ipv6.c
index 6dd64cf..969ffed 100644 (file)
--- a/drivers/net/bonding/bond_ipv6.c
+++ b/drivers/net/bonding/bond_ipv6.c
@@ -37,7 +37,6 @@
 static void bond_glean_dev_ipv6(struct net_device *dev, struct in6_addr *addr)
 {
        struct inet6_dev *idev;
-       struct inet6_ifaddr *ifa;
 
        if (!dev)
                return;
@@ -47,10 +46,12 @@ static void bond_glean_dev_ipv6(struct net_device *dev, struct in6_addr *addr)
                return;
 
        read_lock_bh(&idev->lock);
-       ifa = idev->addr_list;
-       if (ifa)
+       if (!list_empty(&idev->addr_list)) {
+               struct inet6_ifaddr *ifa
+                       = list_first_entry(&idev->addr_list,
+                                          struct inet6_ifaddr, if_list);
                ipv6_addr_copy(addr, &ifa->addr);
-       else
+       } else
                ipv6_addr_set(addr, 0, 0, 0, 0);
 
        read_unlock_bh(&idev->lock);