projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into upstream
[powerpc.git]
/
net
/
sctp
/
ipv6.c
diff --git
a/net/sctp/ipv6.c
b/net/sctp/ipv6.c
index
99c0cef
..
249e503
100644
(file)
--- a/
net/sctp/ipv6.c
+++ b/
net/sctp/ipv6.c
@@
-78,7
+78,6
@@
#include <asm/uaccess.h>
#include <asm/uaccess.h>
-extern int sctp_inetaddr_event(struct notifier_block *, unsigned long, void *);
static struct notifier_block sctp_inet6addr_notifier = {
.notifier_call = sctp_inetaddr_event,
};
static struct notifier_block sctp_inet6addr_notifier = {
.notifier_call = sctp_inetaddr_event,
};
@@
-322,9
+321,9
@@
static void sctp_v6_copy_addrlist(struct list_head *addrlist,
struct inet6_ifaddr *ifp;
struct sctp_sockaddr_entry *addr;
struct inet6_ifaddr *ifp;
struct sctp_sockaddr_entry *addr;
- r
ead_lock(&addrconf_lock
);
+ r
cu_read_lock(
);
if ((in6_dev = __in6_dev_get(dev)) == NULL) {
if ((in6_dev = __in6_dev_get(dev)) == NULL) {
- r
ead_unlock(&addrconf_lock
);
+ r
cu_read_unlock(
);
return;
}
return;
}
@@
-343,7
+342,7
@@
static void sctp_v6_copy_addrlist(struct list_head *addrlist,
}
read_unlock(&in6_dev->lock);
}
read_unlock(&in6_dev->lock);
- r
ead_unlock(&addrconf_lock
);
+ r
cu_read_unlock(
);
}
/* Initialize a sockaddr_storage from in incoming skb. */
}
/* Initialize a sockaddr_storage from in incoming skb. */