diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-03-30 23:08:33 -0400 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-03-30 23:08:33 -0400 |
| commit | 930861c4e6f13ce2e7d06cd1ef11441a065517d9 (patch) | |
| tree | df6ff01f89768ff8d6fe6a64491be30e6e56c3e0 /net/unix/af_unix.c | |
| parent | 8b112171734c791afaf43ccc8c6ec492e7006e44 (diff) | |
| parent | 15f7176eb1cccec0a332541285ee752b935c1c85 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index d1b89820ab4f..baac91049b0e 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
| @@ -1178,8 +1178,7 @@ out_unlock: | |||
| 1178 | unix_state_unlock(other); | 1178 | unix_state_unlock(other); |
| 1179 | 1179 | ||
| 1180 | out: | 1180 | out: |
| 1181 | if (skb) | 1181 | kfree_skb(skb); |
| 1182 | kfree_skb(skb); | ||
| 1183 | if (newsk) | 1182 | if (newsk) |
| 1184 | unix_release_sock(newsk, 0); | 1183 | unix_release_sock(newsk, 0); |
| 1185 | if (other) | 1184 | if (other) |