diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-18 21:03:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-18 21:03:22 -0400 |
| commit | 5c723d26fa223bdb17b9230c77e4e1156884475a (patch) | |
| tree | 03487f55b11cdfa5d3f0edf655fa2351f7d4ed53 /net/tipc | |
| parent | a196e7880905313773be97dbca5aa7b0a0aed71c (diff) | |
| parent | 63903ca6af3d9424a0c2b176f927fa7e7ab2ae8e (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NET]: Remove redundant NULL checks before [kv]free
unaligned access in sk_run_filter()
[IPV6]: Clean up hop-by-hop options handler.
[IPV6] XFRM: Fix decoding session with preceding extension header(s).
[IPV6] XFRM: Don't use old copy of pointer after pskb_may_pull().
[IPV6]: Ensure to have hop-by-hop options in our header of &sk_buff.
[TCP]: Fix truesize underflow
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/name_distr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c index 953307a9df1d..a3bbc891f959 100644 --- a/net/tipc/name_distr.c +++ b/net/tipc/name_distr.c | |||
| @@ -229,8 +229,7 @@ static void node_is_down(struct publication *publ) | |||
| 229 | publ->node, publ->ref, publ->key); | 229 | publ->node, publ->ref, publ->key); |
| 230 | assert(p == publ); | 230 | assert(p == publ); |
| 231 | write_unlock_bh(&tipc_nametbl_lock); | 231 | write_unlock_bh(&tipc_nametbl_lock); |
| 232 | if (publ) | 232 | kfree(publ); |
| 233 | kfree(publ); | ||
| 234 | } | 233 | } |
| 235 | 234 | ||
| 236 | /** | 235 | /** |