diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
commit | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (patch) | |
tree | da3aa535c98cc0957851354ceb0fbff7482d7a9d /net/dccp/output.c | |
parent | 1a1689344add3333d28d1b5495d8043a3877d01c (diff) | |
parent | 4409d28140d9a6e6e3f4f1fdaf7234c4b965d954 (diff) |
Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream
Diffstat (limited to 'net/dccp/output.c')
-rw-r--r-- | net/dccp/output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dccp/output.c b/net/dccp/output.c index 3435542e9652..f5c6aca1dfa4 100644 --- a/net/dccp/output.c +++ b/net/dccp/output.c | |||
@@ -87,7 +87,7 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb) | |||
87 | kfree_skb(skb); | 87 | kfree_skb(skb); |
88 | return -EPROTO; | 88 | return -EPROTO; |
89 | } | 89 | } |
90 | 90 | ||
91 | 91 | ||
92 | /* Build DCCP header and checksum it. */ | 92 | /* Build DCCP header and checksum it. */ |
93 | dh = dccp_zeroed_hdr(skb, dccp_header_size); | 93 | dh = dccp_zeroed_hdr(skb, dccp_header_size); |
@@ -415,7 +415,7 @@ static inline void dccp_connect_init(struct sock *sk) | |||
415 | 415 | ||
416 | sk->sk_err = 0; | 416 | sk->sk_err = 0; |
417 | sock_reset_flag(sk, SOCK_DONE); | 417 | sock_reset_flag(sk, SOCK_DONE); |
418 | 418 | ||
419 | dccp_sync_mss(sk, dst_mtu(dst)); | 419 | dccp_sync_mss(sk, dst_mtu(dst)); |
420 | 420 | ||
421 | /* | 421 | /* |