diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-26 13:13:19 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-26 13:13:19 -0400 |
| commit | c226951b93f7cd7c3a10b17384535b617bd43fd0 (patch) | |
| tree | 07b8796a5c99fbbf587b8d0dbcbc173cfe5e381e /net/dccp/ipv4.c | |
| parent | b0df3bd1e553e901ec7297267611a5db88240b38 (diff) | |
| parent | e8216dee838c09776680a6f1a2e54d81f3cdfa14 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'net/dccp/ipv4.c')
| -rw-r--r-- | net/dccp/ipv4.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 9a1a76a7dc41..66be29b6f508 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c | |||
| @@ -56,9 +56,6 @@ int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) | |||
| 56 | 56 | ||
| 57 | dp->dccps_role = DCCP_ROLE_CLIENT; | 57 | dp->dccps_role = DCCP_ROLE_CLIENT; |
| 58 | 58 | ||
| 59 | if (dccp_service_not_initialized(sk)) | ||
| 60 | return -EPROTO; | ||
| 61 | |||
| 62 | if (addr_len < sizeof(struct sockaddr_in)) | 59 | if (addr_len < sizeof(struct sockaddr_in)) |
| 63 | return -EINVAL; | 60 | return -EINVAL; |
| 64 | 61 | ||