diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-06 11:55:55 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-06 11:55:55 +0300 |
| commit | 230f9bb701d37ae9b48e96456689452978f5c439 (patch) | |
| tree | 9d2690917533bbb4498c8c9df838de2d38360912 /net/ipv6/udp.c | |
| parent | 000ba2e43f33901859fd794bb33c885909d53b3b (diff) | |
| parent | 887e671f324d9898aaedb29a6ece6c853c394067 (diff) | |
| download | linux-230f9bb701d37ae9b48e96456689452978f5c439.tar.xz | |
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.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index bbe2f3e445fc..5bc7cdbf030a 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; |