Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 193629
b: refs/heads/master
c: 502a2ff
h: refs/heads/master
i:
  193627: 42ea69f
v: v3
  • Loading branch information
stephen hemminger authored and David S. Miller committed Mar 20, 2010
1 parent d689a60 commit e662434
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 48 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3a88a81d89c20be312b3b219b185bbdde24b8fb8
refs/heads/master: 502a2ffd7376ae27cfde6172257db0ff9d8cfec2
9 changes: 5 additions & 4 deletions trunk/drivers/net/bonding/bond_ipv6.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions trunk/include/net/if_inet6.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ struct inet6_ifaddr {
struct rt6_info *rt;

struct hlist_node addr_lst;
struct inet6_ifaddr *if_next; /* next addr in inet6_dev */
struct list_head if_list;

#ifdef CONFIG_IPV6_PRIVACY
struct list_head tmp_list;
Expand Down Expand Up @@ -152,9 +152,9 @@ struct ipv6_devstat {
};

struct inet6_dev {
struct net_device *dev;
struct net_device *dev;

struct inet6_ifaddr *addr_list;
struct list_head addr_list;

struct ifmcaddr6 *mc_list;
struct ifmcaddr6 *mc_tomb;
Expand Down
78 changes: 39 additions & 39 deletions trunk/net/ipv6/addrconf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ void in6_dev_finish_destroy(struct inet6_dev *idev)
{
struct net_device *dev = idev->dev;

WARN_ON(idev->addr_list != NULL);
WARN_ON(!list_empty(&idev->addr_list));
WARN_ON(idev->mc_list != NULL);

#ifdef NET_REFCNT_DEBUG
Expand Down Expand Up @@ -350,6 +350,8 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev)

rwlock_init(&ndev->lock);
ndev->dev = dev;
INIT_LIST_HEAD(&ndev->addr_list);

memcpy(&ndev->cnf, dev_net(dev)->ipv6.devconf_dflt, sizeof(ndev->cnf));
ndev->cnf.mtu6 = dev->mtu;
ndev->cnf.sysctl = NULL;
Expand Down Expand Up @@ -466,7 +468,8 @@ static void dev_forward_change(struct inet6_dev *idev)
else
ipv6_dev_mc_dec(dev, &in6addr_linklocal_allrouters);
}
for (ifa=idev->addr_list; ifa; ifa=ifa->if_next) {

list_for_each_entry(ifa, &idev->addr_list, if_list) {
if (ifa->flags&IFA_F_TENTATIVE)
continue;
if (idev->cnf.forwarding)
Expand Down Expand Up @@ -532,7 +535,6 @@ static void inet6_ifa_finish_destroy_rcu(struct rcu_head *head)
/* Nobody refers to this ifaddr, destroy it */
void inet6_ifa_finish_destroy(struct inet6_ifaddr *ifp)
{
WARN_ON(ifp->if_next != NULL);
WARN_ON(!hlist_unhashed(&ifp->addr_lst));

#ifdef NET_REFCNT_DEBUG
Expand All @@ -556,21 +558,21 @@ void inet6_ifa_finish_destroy(struct inet6_ifaddr *ifp)
static void
ipv6_link_dev_addr(struct inet6_dev *idev, struct inet6_ifaddr *ifp)
{
struct inet6_ifaddr *ifa, **ifap;
struct list_head *p;
int ifp_scope = ipv6_addr_src_scope(&ifp->addr);

/*
* Each device address list is sorted in order of scope -
* global before linklocal.
*/
for (ifap = &idev->addr_list; (ifa = *ifap) != NULL;
ifap = &ifa->if_next) {
list_for_each(p, &idev->addr_list) {
struct inet6_ifaddr *ifa
= list_entry(p, struct inet6_ifaddr, if_list);
if (ifp_scope >= ipv6_addr_src_scope(&ifa->addr))
break;
}

ifp->if_next = *ifap;
*ifap = ifp;
list_add(&ifp->if_list, p);
}

static u32 ipv6_addr_hash(const struct in6_addr *addr)
Expand Down Expand Up @@ -703,7 +705,7 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr, int pfxlen,

static void ipv6_del_addr(struct inet6_ifaddr *ifp)
{
struct inet6_ifaddr *ifa, **ifap;
struct inet6_ifaddr *ifa, *ifn;
struct inet6_dev *idev = ifp->idev;
int hash;
int deleted = 0, onlink = 0;
Expand All @@ -730,11 +732,11 @@ static void ipv6_del_addr(struct inet6_ifaddr *ifp)
}
#endif

for (ifap = &idev->addr_list; (ifa=*ifap) != NULL;) {
list_for_each_entry_safe(ifa, ifn, &idev->addr_list, if_list) {
if (ifa == ifp) {
*ifap = ifa->if_next;
list_del_init(&ifp->if_list);
__in6_ifa_put(ifp);
ifa->if_next = NULL;

if (!(ifp->flags & IFA_F_PERMANENT) || onlink > 0)
break;
deleted = 1;
Expand Down Expand Up @@ -767,7 +769,6 @@ static void ipv6_del_addr(struct inet6_ifaddr *ifp)
}
}
}
ifap = &ifa->if_next;
}
write_unlock_bh(&idev->lock);

Expand Down Expand Up @@ -1146,7 +1147,7 @@ int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev,
continue;

read_lock_bh(&idev->lock);
for (score->ifa = idev->addr_list; score->ifa; score->ifa = score->ifa->if_next) {
list_for_each_entry(score->ifa, &idev->addr_list, if_list) {
int i;

/*
Expand Down Expand Up @@ -1238,8 +1239,9 @@ int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
struct inet6_ifaddr *ifp;

read_lock_bh(&idev->lock);
for (ifp=idev->addr_list; ifp; ifp=ifp->if_next) {
if (ifp->scope == IFA_LINK && !(ifp->flags & banned_flags)) {
list_for_each_entry(ifp, &idev->addr_list, if_list) {
if (ifp->scope == IFA_LINK &&
!(ifp->flags & banned_flags)) {
ipv6_addr_copy(addr, &ifp->addr);
err = 0;
break;
Expand All @@ -1257,7 +1259,7 @@ static int ipv6_count_addresses(struct inet6_dev *idev)
struct inet6_ifaddr *ifp;

read_lock_bh(&idev->lock);
for (ifp=idev->addr_list; ifp; ifp=ifp->if_next)
list_for_each_entry(ifp, &idev->addr_list, if_list)
cnt++;
read_unlock_bh(&idev->lock);
return cnt;
Expand Down Expand Up @@ -1317,7 +1319,7 @@ int ipv6_chk_prefix(struct in6_addr *addr, struct net_device *dev)
idev = __in6_dev_get(dev);
if (idev) {
read_lock_bh(&idev->lock);
for (ifa = idev->addr_list; ifa; ifa = ifa->if_next) {
list_for_each_entry(ifa, &idev->addr_list, if_list) {
onlink = ipv6_prefix_equal(addr, &ifa->addr,
ifa->prefix_len);
if (onlink)
Expand Down Expand Up @@ -1555,7 +1557,7 @@ static int ipv6_inherit_eui64(u8 *eui, struct inet6_dev *idev)
struct inet6_ifaddr *ifp;

read_lock_bh(&idev->lock);
for (ifp=idev->addr_list; ifp; ifp=ifp->if_next) {
list_for_each_entry(ifp, &idev->addr_list, if_list) {
if (ifp->scope == IFA_LINK && !(ifp->flags&IFA_F_TENTATIVE)) {
memcpy(eui, ifp->addr.s6_addr+8, 8);
err = 0;
Expand Down Expand Up @@ -2159,7 +2161,7 @@ static int inet6_addr_del(struct net *net, int ifindex, struct in6_addr *pfx,
return -ENXIO;

read_lock_bh(&idev->lock);
for (ifp = idev->addr_list; ifp; ifp=ifp->if_next) {
list_for_each_entry(ifp, &idev->addr_list, if_list) {
if (ifp->prefix_len == plen &&
ipv6_addr_equal(pfx, &ifp->addr)) {
in6_ifa_hold(ifp);
Expand All @@ -2170,7 +2172,7 @@ static int inet6_addr_del(struct net *net, int ifindex, struct in6_addr *pfx,
/* If the last address is deleted administratively,
disable IPv6 on this interface.
*/
if (idev->addr_list == NULL)
if (list_empty(&idev->addr_list))
addrconf_ifdown(idev->dev, 1);
return 0;
}
Expand Down Expand Up @@ -2602,9 +2604,10 @@ static void addrconf_type_change(struct net_device *dev, unsigned long event)

static int addrconf_ifdown(struct net_device *dev, int how)
{
struct inet6_dev *idev;
struct inet6_ifaddr *ifa, *keep_list, **bifa;
struct net *net = dev_net(dev);
struct inet6_dev *idev;
struct inet6_ifaddr *ifa;
LIST_HEAD(keep_list);

ASSERT_RTNL();

Expand Down Expand Up @@ -2658,23 +2661,18 @@ static int addrconf_ifdown(struct net_device *dev, int how)
write_lock_bh(&idev->lock);
}
#endif
keep_list = NULL;
bifa = &keep_list;
while ((ifa = idev->addr_list) != NULL) {
idev->addr_list = ifa->if_next;
ifa->if_next = NULL;

while (!list_empty(&idev->addr_list)) {
ifa = list_first_entry(&idev->addr_list,
struct inet6_ifaddr, if_list);
addrconf_del_timer(ifa);

/* If just doing link down, and address is permanent
and not link-local, then retain it. */
if (how == 0 &&
(ifa->flags&IFA_F_PERMANENT) &&
!(ipv6_addr_type(&ifa->addr) & IPV6_ADDR_LINKLOCAL)) {

/* Move to holding list */
*bifa = ifa;
bifa = &ifa->if_next;
list_move_tail(&ifa->if_list, &keep_list);

/* If not doing DAD on this address, just keep it. */
if ((dev->flags&(IFF_NOARP|IFF_LOOPBACK)) ||
Expand All @@ -2690,6 +2688,7 @@ static int addrconf_ifdown(struct net_device *dev, int how)
ifa->flags |= IFA_F_TENTATIVE;
in6_ifa_hold(ifa);
} else {
list_del(&ifa->if_list);
ifa->dead = 1;
}
write_unlock_bh(&idev->lock);
Expand All @@ -2707,7 +2706,7 @@ static int addrconf_ifdown(struct net_device *dev, int how)
write_lock_bh(&idev->lock);
}

idev->addr_list = keep_list;
list_splice(&keep_list, &idev->addr_list);

write_unlock_bh(&idev->lock);

Expand Down Expand Up @@ -2917,7 +2916,7 @@ static void addrconf_dad_run(struct inet6_dev *idev) {
struct inet6_ifaddr *ifp;

read_lock_bh(&idev->lock);
for (ifp = idev->addr_list; ifp; ifp = ifp->if_next) {
list_for_each_entry(ifp, &idev->addr_list, if_list) {
spin_lock(&ifp->lock);
if (!(ifp->flags & IFA_F_TENTATIVE)) {
spin_unlock(&ifp->lock);
Expand Down Expand Up @@ -3500,19 +3499,19 @@ static int in6_dump_addrs(struct inet6_dev *idev, struct sk_buff *skb,
struct netlink_callback *cb, enum addr_type_t type,
int s_ip_idx, int *p_ip_idx)
{
struct inet6_ifaddr *ifa;
struct ifmcaddr6 *ifmca;
struct ifacaddr6 *ifaca;
int err = 1;
int ip_idx = *p_ip_idx;

read_lock_bh(&idev->lock);
switch (type) {
case UNICAST_ADDR:
case UNICAST_ADDR: {
struct inet6_ifaddr *ifa;

/* unicast address incl. temp addr */
for (ifa = idev->addr_list; ifa;
ifa = ifa->if_next, ip_idx++) {
if (ip_idx < s_ip_idx)
list_for_each_entry(ifa, &idev->addr_list, if_list) {
if (++ip_idx < s_ip_idx)
continue;
err = inet6_fill_ifaddr(skb, ifa,
NETLINK_CB(cb->skb).pid,
Expand All @@ -3523,6 +3522,7 @@ static int in6_dump_addrs(struct inet6_dev *idev, struct sk_buff *skb,
break;
}
break;
}
case MULTICAST_ADDR:
/* multicast address */
for (ifmca = idev->mc_list; ifmca;
Expand Down
2 changes: 1 addition & 1 deletion trunk/net/sctp/ipv6.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ static void sctp_v6_copy_addrlist(struct list_head *addrlist,
}

read_lock_bh(&in6_dev->lock);
for (ifp = in6_dev->addr_list; ifp; ifp = ifp->if_next) {
list_for_each_entry(ifp, &in6_dev->addr_list, if_list) {
/* Add the address to the local list. */
addr = t_new(struct sctp_sockaddr_entry, GFP_ATOMIC);
if (addr) {
Expand Down

0 comments on commit e662434

Please sign in to comment.