aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/udp.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-11-06 00:55:55 -0800
committerDavid S. Miller <davem@davemloft.net>2009-11-06 00:55:55 -0800
commit230f9bb701d37ae9b48e96456689452978f5c439 (patch)
tree9d2690917533bbb4498c8c9df838de2d38360912 /net/ipv6/udp.c
parent000ba2e43f33901859fd794bb33c885909d53b3b (diff)
parent887e671f324d9898aaedb29a6ece6c853c394067 (diff)
downloadmrst-s0i3-test-230f9bb701d37ae9b48e96456689452978f5c439.tar.gz
mrst-s0i3-test-230f9bb701d37ae9b48e96456689452978f5c439.tar.xz
mrst-s0i3-test-230f9bb701d37ae9b48e96456689452978f5c439.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/usb/cdc_ether.c All CDC ethernet devices of type USB_CLASS_COMM need to use '&mbm_info'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/udp.c')
-rw-r--r--net/ipv6/udp.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index bbe2f3e445f..5bc7cdbf030 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -288,9 +288,7 @@ try_again:
err = ulen;
out_free:
- lock_sock(sk);
- skb_free_datagram(sk, skb);
- release_sock(sk);
+ skb_free_datagram_locked(sk, skb);
out:
return err;