diff options
Diffstat (limited to 'net/dccp/ipv6.c')
-rw-r--r-- | net/dccp/ipv6.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 599b0be21515..2e194c8f9953 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c | |||
@@ -1032,7 +1032,6 @@ static int dccp_v6_rcv(struct sk_buff **pskb, unsigned int *nhoffp) | |||
1032 | const struct dccp_hdr *dh; | 1032 | const struct dccp_hdr *dh; |
1033 | struct sk_buff *skb = *pskb; | 1033 | struct sk_buff *skb = *pskb; |
1034 | struct sock *sk; | 1034 | struct sock *sk; |
1035 | int rc; | ||
1036 | 1035 | ||
1037 | /* Step 1: Check header basics: */ | 1036 | /* Step 1: Check header basics: */ |
1038 | 1037 | ||
@@ -1077,21 +1076,7 @@ static int dccp_v6_rcv(struct sk_buff **pskb, unsigned int *nhoffp) | |||
1077 | if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) | 1076 | if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) |
1078 | goto discard_and_relse; | 1077 | goto discard_and_relse; |
1079 | 1078 | ||
1080 | if (sk_filter(sk, skb, 0)) | 1079 | return sk_receive_skb(sk, skb) ? -1 : 0; |
1081 | goto discard_and_relse; | ||
1082 | |||
1083 | skb->dev = NULL; | ||
1084 | |||
1085 | bh_lock_sock(sk); | ||
1086 | rc = 0; | ||
1087 | if (!sock_owned_by_user(sk)) | ||
1088 | rc = dccp_v6_do_rcv(sk, skb); | ||
1089 | else | ||
1090 | sk_add_backlog(sk, skb); | ||
1091 | bh_unlock_sock(sk); | ||
1092 | |||
1093 | sock_put(sk); | ||
1094 | return rc ? -1 : 0; | ||
1095 | 1080 | ||
1096 | no_dccp_socket: | 1081 | no_dccp_socket: |
1097 | if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) | 1082 | if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) |