Commit 1b830996 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 's390-net' 



Ursula Braun says:

====================
s390: af_iucv patches

here are 2 patches for the s390-only af_iucv socket family code.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b07bf5fa 8c68b1a0

net/iucv/af_iucv.c

+26 −8
Original line number Diff line number Diff line
@@ -453,19 +453,27 @@ static void iucv_sever_path(struct sock *sk, int with_user_data) 
	}

}



/* Send FIN through an IUCV socket for HIPER transport */

/* Send controlling flags through an IUCV socket for HIPER transport */

static int iucv_send_ctrl(struct sock *sk, u8 flags)

{

	int err = 0;

	int blen;

	struct sk_buff *skb;

	u8 shutdown = 0;



	blen = sizeof(struct af_iucv_trans_hdr) + ETH_HLEN;

	if (sk->sk_shutdown & SEND_SHUTDOWN) {

		/* controlling flags should be sent anyway */

		shutdown = sk->sk_shutdown;

		sk->sk_shutdown &= RCV_SHUTDOWN;

	}

	skb = sock_alloc_send_skb(sk, blen, 1, &err);

	if (skb) {

		skb_reserve(skb, blen);

		err = afiucv_hs_send(NULL, sk, skb, flags);

	}

	if (shutdown)

		sk->sk_shutdown = shutdown;

	return err;

}
@@ -1315,8 +1323,13 @@ static void iucv_process_message(struct sock *sk, struct sk_buff *skb, 
	}



	IUCV_SKB_CB(skb)->offset = 0;

	if (sock_queue_rcv_skb(sk, skb))

		skb_queue_head(&iucv_sk(sk)->backlog_skb_q, skb);

	if (sk_filter(sk, skb)) {

		atomic_inc(&sk->sk_drops);	/* skb rejected by filter */

		kfree_skb(skb);

		return;

	}

	if (__sock_queue_rcv_skb(sk, skb))	/* handle rcv queue full */

		skb_queue_tail(&iucv_sk(sk)->backlog_skb_q, skb);

}



/* iucv_process_message_q() - Process outstanding IUCV messages
@@ -1430,13 +1443,13 @@ static int iucv_sock_recvmsg(struct socket *sock, struct msghdr *msg, 
		rskb = skb_dequeue(&iucv->backlog_skb_q);

		while (rskb) {

			IUCV_SKB_CB(rskb)->offset = 0;

			if (sock_queue_rcv_skb(sk, rskb)) {

			if (__sock_queue_rcv_skb(sk, rskb)) {

				/* handle rcv queue full */

				skb_queue_head(&iucv->backlog_skb_q,

						rskb);

				break;

			} else {

				rskb = skb_dequeue(&iucv->backlog_skb_q);

			}

			rskb = skb_dequeue(&iucv->backlog_skb_q);

		}

		if (skb_queue_empty(&iucv->backlog_skb_q)) {

			if (!list_empty(&iucv->message_q.list))
@@ -2116,12 +2129,17 @@ static int afiucv_hs_callback_rx(struct sock *sk, struct sk_buff *skb) 
	skb_reset_transport_header(skb);

	skb_reset_network_header(skb);

	IUCV_SKB_CB(skb)->offset = 0;

	if (sk_filter(sk, skb)) {

		atomic_inc(&sk->sk_drops);	/* skb rejected by filter */

		kfree_skb(skb);

		return NET_RX_SUCCESS;

	}



	spin_lock(&iucv->message_q.lock);

	if (skb_queue_empty(&iucv->backlog_skb_q)) {

		if (sock_queue_rcv_skb(sk, skb)) {

		if (__sock_queue_rcv_skb(sk, skb))

			/* handle rcv queue full */

			skb_queue_tail(&iucv->backlog_skb_q, skb);

		}

	} else

		skb_queue_tail(&iucv_sk(sk)->backlog_skb_q, skb);

	spin_unlock(&iucv->message_q.lock);