Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[deliverable/linux.git] / net / dccp / output.c

diff --git a/net/dccp/output.c b/net/dccp/output.c
index 3435542e96528f5cce06257980e7ee95cc28ccf8..f5c6aca1dfa45557a31ed6f9fe0a9b0d4f109a9f 100644 (file)
--- 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)
                        kfree_skb(skb);
                        return -EPROTO;
                }
-               
+
 
                /* Build DCCP header and checksum it. */
                dh = dccp_zeroed_hdr(skb, dccp_header_size);
@@ -415,7 +415,7 @@ static inline void dccp_connect_init(struct sock *sk)
 
        sk->sk_err = 0;
        sock_reset_flag(sk, SOCK_DONE);
-       
+
        dccp_sync_mss(sk, dst_mtu(dst));
 
        /*