[ARP]: Minus one level of ndentation in arp_req_delete

[linux-2.6] / net / dccp / output.c

diff --git a/net/dccp/output.c b/net/dccp/output.c
index 6a334ed5e9d65de4654f2b8fcdf0ecae3b1d4540..7caa7f57bb7ea5f956079347be7ce9925f6f78bc 100644 (file)
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -170,41 +170,45 @@ void dccp_write_space(struct sock *sk)
                wake_up_interruptible(sk->sk_sleep);
        /* Should agree with poll, otherwise some programs break */
        if (sock_writeable(sk))
-               sk_wake_async(sk, 2, POLL_OUT);
+               sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT);
 
        read_unlock(&sk->sk_callback_lock);
 }
 
 /**
  * dccp_wait_for_ccid - Wait for ccid to tell us we can send a packet
- * @sk: socket to wait for
+ * @sk:    socket to wait for
+ * @skb:   current skb to pass on for waiting
+ * @delay: sleep timeout in milliseconds (> 0)
+ * This function is called by default when the socket is closed, and
+ * when a non-zero linger time is set on the socket. For consistency
  */
-static int dccp_wait_for_ccid(struct sock *sk, struct sk_buff *skb)
+static int dccp_wait_for_ccid(struct sock *sk, struct sk_buff *skb, int delay)
 {
        struct dccp_sock *dp = dccp_sk(sk);
        DEFINE_WAIT(wait);
-       unsigned long delay;
+       unsigned long jiffdelay;
        int rc;
 
-       while (1) {
+       do {
+               dccp_pr_debug("delayed send by %d msec\n", delay);
+               jiffdelay = msecs_to_jiffies(delay);
+
                prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);
 
+               sk->sk_write_pending++;
+               release_sock(sk);
+               schedule_timeout(jiffdelay);
+               lock_sock(sk);
+               sk->sk_write_pending--;
+
                if (sk->sk_err)
                        goto do_error;
                if (signal_pending(current))
                        goto do_interrupted;
 
                rc = ccid_hc_tx_send_packet(dp->dccps_hc_tx_ccid, sk, skb);
-               if (rc <= 0)
-                       break;
-               dccp_pr_debug("delayed send by %d msec\n", rc);
-               delay = msecs_to_jiffies(rc);
-               sk->sk_write_pending++;
-               release_sock(sk);
-               schedule_timeout(delay);
-               lock_sock(sk);
-               sk->sk_write_pending--;
-       }
+       } while ((delay = rc) > 0);
 out:
        finish_wait(sk->sk_sleep, &wait);
        return rc;
@@ -231,7 +235,7 @@ void dccp_write_xmit(struct sock *sk, int block)
                                                msecs_to_jiffies(err)+jiffies);
                                break;
                        } else
-                               err = dccp_wait_for_ccid(sk, skb);
+                               err = dccp_wait_for_ccid(sk, skb, err);
                        if (err && err != -EINTR)
                                DCCP_BUG("err=%d after dccp_wait_for_ccid", err);
                }
@@ -387,7 +391,7 @@ int dccp_send_reset(struct sock *sk, enum dccp_reset_codes code)
         * FIXME: what if rebuild_header fails?
         * Should we be doing a rebuild_header here?
         */
-       int err = inet_sk_rebuild_header(sk);
+       int err = inet_csk(sk)->icsk_af_ops->rebuild_header(sk);
 
        if (err != 0)
                return err;