diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-11-23 12:34:58 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-11-23 12:34:58 -0500 |
| commit | 9b8b317d58084b9a44f6f33b355c4278d9f841fb (patch) | |
| tree | e0df89800bf4301c4017db3cdf04a2056ec1a852 /net/ipv4/udp.c | |
| parent | 78c210efdefe07131f91ed512a3308b15bb14e2f (diff) | |
| parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
Merge commit 'v2.6.32-rc8' into HEAD
Diffstat (limited to 'net/ipv4/udp.c')
| -rw-r--r-- | net/ipv4/udp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index d0d436d6216c..0fa9f70e4b19 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
| @@ -999,9 +999,7 @@ try_again: | |||
| 999 | err = ulen; | 999 | err = ulen; |
| 1000 | 1000 | ||
| 1001 | out_free: | 1001 | out_free: |
| 1002 | lock_sock(sk); | 1002 | skb_free_datagram_locked(sk, skb); |
| 1003 | skb_free_datagram(sk, skb); | ||
| 1004 | release_sock(sk); | ||
| 1005 | out: | 1003 | out: |
| 1006 | return err; | 1004 | return err; |
| 1007 | 1005 | ||