Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d8ad9d7 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[NET]: Name magic constants in sock_wake_async() 



The sock_wake_async() performs a bit different actions
depending on "how" argument. Unfortunately this argument
ony has numerical magic values.

I propose to give names to their constants to help people
reading this function callers understand what's going on
without looking into this function all the time.

I suppose this is 2.6.25 material, but if it's not (or the
naming seems poor/bad/awful), I can rework it against the
current net-2.6 tree.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ce865a61

include/linux/net.h

+7 −0
Original line number Diff line number Diff line
@@ -186,6 +186,13 @@ struct net_proto_family { 
struct iovec;

struct kvec;



enum {

	SOCK_WAKE_IO,

	SOCK_WAKE_WAITD,

	SOCK_WAKE_SPACE,

	SOCK_WAKE_URG,

};



extern int	     sock_wake_async(struct socket *sk, int how, int band);

extern int	     sock_register(const struct net_proto_family *fam);

extern void	     sock_unregister(int family);

net/atm/common.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static void vcc_write_space(struct sock *sk) 
		if (sk->sk_sleep && waitqueue_active(sk->sk_sleep))

			wake_up_interruptible(sk->sk_sleep);



		sk_wake_async(sk, 2, POLL_OUT);

		sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT);

	}



	read_unlock(&sk->sk_callback_lock);

net/core/sock.c

+4 −4
Original line number Diff line number Diff line
@@ -1498,7 +1498,7 @@ static void sock_def_error_report(struct sock *sk) 
	read_lock(&sk->sk_callback_lock);

	if (sk->sk_sleep && waitqueue_active(sk->sk_sleep))

		wake_up_interruptible(sk->sk_sleep);

	sk_wake_async(sk,0,POLL_ERR);

	sk_wake_async(sk, SOCK_WAKE_IO, POLL_ERR);

	read_unlock(&sk->sk_callback_lock);

}
@@ -1507,7 +1507,7 @@ static void sock_def_readable(struct sock *sk, int len) 
	read_lock(&sk->sk_callback_lock);

	if (sk->sk_sleep && waitqueue_active(sk->sk_sleep))

		wake_up_interruptible(sk->sk_sleep);

	sk_wake_async(sk,1,POLL_IN);

	sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_IN);

	read_unlock(&sk->sk_callback_lock);

}
@@ -1524,7 +1524,7 @@ static void sock_def_write_space(struct sock *sk) 


		/* 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);
@@ -1539,7 +1539,7 @@ void sk_send_sigurg(struct sock *sk) 
{

	if (sk->sk_socket && sk->sk_socket->file)

		if (send_sigurg(&sk->sk_socket->file->f_owner))

			sk_wake_async(sk, 3, POLL_PRI);

			sk_wake_async(sk, SOCK_WAKE_URG, POLL_PRI);

}



void sk_reset_timer(struct sock *sk, struct timer_list* timer,

net/core/stream.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ void sk_stream_write_space(struct sock *sk) 
		if (sk->sk_sleep && waitqueue_active(sk->sk_sleep))

			wake_up_interruptible(sk->sk_sleep);

		if (sock->fasync_list && !(sk->sk_shutdown & SEND_SHUTDOWN))

			sock_wake_async(sock, 2, POLL_OUT);

			sock_wake_async(sock, SOCK_WAKE_SPACE, POLL_OUT);

	}

}

net/dccp/input.c

+4 −4
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static void dccp_rcv_close(struct sock *sk, struct sk_buff *skb) 
	dccp_send_reset(sk, DCCP_RESET_CODE_CLOSED);

	dccp_fin(sk, skb);

	dccp_set_state(sk, DCCP_CLOSED);

	sk_wake_async(sk, 1, POLL_HUP);

	sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_HUP);

}



static void dccp_rcv_closereq(struct sock *sk, struct sk_buff *skb)
@@ -90,7 +90,7 @@ static void dccp_rcv_reset(struct sock *sk, struct sk_buff *skb) 
	dccp_fin(sk, skb);



	if (err && !sock_flag(sk, SOCK_DEAD))

		sk_wake_async(sk, 0, POLL_ERR);

		sk_wake_async(sk, SOCK_WAKE_IO, POLL_ERR);

	dccp_time_wait(sk, DCCP_TIME_WAIT, 0);

}
@@ -416,7 +416,7 @@ static int dccp_rcv_request_sent_state_process(struct sock *sk, 


		if (!sock_flag(sk, SOCK_DEAD)) {

			sk->sk_state_change(sk);

			sk_wake_async(sk, 0, POLL_OUT);

			sk_wake_async(sk, SOCK_WAKE_IO, POLL_OUT);

		}



		if (sk->sk_write_pending || icsk->icsk_ack.pingpong ||
@@ -624,7 +624,7 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb, 
		switch (old_state) {

		case DCCP_PARTOPEN:

			sk->sk_state_change(sk);

			sk_wake_async(sk, 0, POLL_OUT);

			sk_wake_async(sk, SOCK_WAKE_IO, POLL_OUT);

			break;

		}

	} else if (unlikely(dh->dccph_type == DCCP_PKT_SYNC)) {