diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /net/sctp/bind_addr.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'net/sctp/bind_addr.c')
| -rw-r--r-- | net/sctp/bind_addr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/bind_addr.c b/net/sctp/bind_addr.c index 13a6fba41077..faf71d179e46 100644 --- a/net/sctp/bind_addr.c +++ b/net/sctp/bind_addr.c | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | */ | 43 | */ |
| 44 | 44 | ||
| 45 | #include <linux/types.h> | 45 | #include <linux/types.h> |
| 46 | #include <linux/slab.h> | ||
| 46 | #include <linux/in.h> | 47 | #include <linux/in.h> |
| 47 | #include <net/sock.h> | 48 | #include <net/sock.h> |
| 48 | #include <net/ipv6.h> | 49 | #include <net/ipv6.h> |
| @@ -186,7 +187,6 @@ int sctp_add_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *new, | |||
| 186 | addr->valid = 1; | 187 | addr->valid = 1; |
| 187 | 188 | ||
| 188 | INIT_LIST_HEAD(&addr->list); | 189 | INIT_LIST_HEAD(&addr->list); |
| 189 | INIT_RCU_HEAD(&addr->rcu); | ||
| 190 | 190 | ||
| 191 | /* We always hold a socket lock when calling this function, | 191 | /* We always hold a socket lock when calling this function, |
| 192 | * and that acts as a writer synchronizing lock. | 192 | * and that acts as a writer synchronizing lock. |