git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
[pandora-kernel.git]
/
net
/
dccp
/
ipv4.c
diff --git
a/net/dccp/ipv4.c
b/net/dccp/ipv4.c
index
2904799
..
f2c011f
100644
(file)
--- a/
net/dccp/ipv4.c
+++ b/
net/dccp/ipv4.c
@@
-498,7
+498,7
@@
int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
goto drop;
if (dccp_parse_options(sk, skb))
- goto drop;
+ goto drop
_and_free
;
dccp_openreq_init(req, &dp, skb);