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

Commit af426d32 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

[LLC]: Help the compiler with likely/unlikely, saving some more bytes 



Signed-off-by: default avatarJochen Friedrich <jochen@scram.de>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
parent 0eb80172

net/llc/af_llc.c

+19 −18
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static int llc_ui_create(struct socket *sock, int protocol) 
	struct sock *sk;

	int rc = -ESOCKTNOSUPPORT;



	if (sock->type == SOCK_DGRAM || sock->type == SOCK_STREAM) {

	if (likely(sock->type == SOCK_DGRAM || sock->type == SOCK_STREAM)) {

		rc = -ENOMEM;

		sk = llc_sk_alloc(PF_LLC, GFP_KERNEL, &llc_proto);

		if (sk) {
@@ -177,7 +177,7 @@ static int llc_ui_release(struct socket *sock) 
	struct sock *sk = sock->sk;

	struct llc_sock *llc;



	if (!sk)

	if (unlikely(sk == NULL))

		goto out;

	sock_hold(sk);

	lock_sock(sk);
@@ -294,10 +294,10 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen) 
	int rc = -EINVAL;



	dprintk("%s: binding %02X\n", __FUNCTION__, addr->sllc_sap);

	if (!sock_flag(sk, SOCK_ZAPPED) || addrlen != sizeof(*addr))

	if (unlikely(!sock_flag(sk, SOCK_ZAPPED) || addrlen != sizeof(*addr)))

		goto out;

	rc = -EAFNOSUPPORT;

	if (addr->sllc_family != AF_LLC)

	if (unlikely(addr->sllc_family != AF_LLC))

		goto out;

	if (!addr->sllc_sap) {

		rc = -EUSERS;
@@ -358,7 +358,7 @@ static int llc_ui_shutdown(struct socket *sock, int how) 
	int rc = -ENOTCONN;



	lock_sock(sk);

	if (sk->sk_state != TCP_ESTABLISHED)

	if (unlikely(sk->sk_state != TCP_ESTABLISHED))

		goto out;

	rc = -EINVAL;

	if (how != 2)
@@ -396,10 +396,15 @@ static int llc_ui_connect(struct socket *sock, struct sockaddr *uaddr, 
	int rc = -EINVAL;



	lock_sock(sk);

	if (addrlen != sizeof(*addr))

	if (unlikely(addrlen != sizeof(*addr)))

		goto out;

	rc = -EAFNOSUPPORT;

	if (addr->sllc_family != AF_LLC)

	if (unlikely(addr->sllc_family != AF_LLC))

		goto out;

	if (unlikely(sk->sk_type != SOCK_STREAM))

		goto out;

	rc = -EALREADY;

	if (unlikely(sock->state == SS_CONNECTING))

		goto out;

	/* bind connection to sap if user hasn't done it. */

	if (sock_flag(sk, SOCK_ZAPPED)) {
@@ -410,11 +415,6 @@ static int llc_ui_connect(struct socket *sock, struct sockaddr *uaddr, 
		llc->daddr.lsap = addr->sllc_sap;

		memcpy(llc->daddr.mac, addr->sllc_mac, IFHWADDRLEN);

	}

	if (sk->sk_type != SOCK_STREAM)

		goto out;

	rc = -EALREADY;

	if (sock->state == SS_CONNECTING)

		goto out;

	sock->state = SS_CONNECTING;

	sk->sk_state   = TCP_SYN_SENT;

	llc->link   = llc_ui_next_link_no(llc->sap->laddr.lsap);
@@ -448,10 +448,10 @@ static int llc_ui_listen(struct socket *sock, int backlog) 
	int rc = -EINVAL;



	lock_sock(sk);

	if (sock->state != SS_UNCONNECTED)

	if (unlikely(sock->state != SS_UNCONNECTED))

		goto out;

	rc = -EOPNOTSUPP;

	if (sk->sk_type != SOCK_STREAM)

	if (unlikely(sk->sk_type != SOCK_STREAM))

		goto out;

	rc = -EAGAIN;

	if (sock_flag(sk, SOCK_ZAPPED))
@@ -614,10 +614,11 @@ static int llc_ui_accept(struct socket *sock, struct socket *newsock, int flags) 
	dprintk("%s: accepting on %02X\n", __FUNCTION__,

	        llc_sk(sk)->laddr.lsap);

	lock_sock(sk);

	if (sk->sk_type != SOCK_STREAM)

	if (unlikely(sk->sk_type != SOCK_STREAM))

		goto out;

	rc = -EINVAL;

	if (sock->state != SS_UNCONNECTED || sk->sk_state != TCP_LISTEN)

	if (unlikely(sock->state != SS_UNCONNECTED ||

		     sk->sk_state != TCP_LISTEN))

		goto out;

	/* wait for a connection to arrive. */

	rc = llc_ui_wait_for_data(sk, sk->sk_rcvtimeo);
@@ -880,7 +881,7 @@ static int llc_ui_setsockopt(struct socket *sock, int level, int optname, 
	int rc = -EINVAL, opt;



	lock_sock(sk);

	if (level != SOL_LLC || optlen != sizeof(int))

	if (unlikely(level != SOL_LLC || optlen != sizeof(int)))

		goto out;

	rc = get_user(opt, (int __user *)optval);

	if (rc)
@@ -955,7 +956,7 @@ static int llc_ui_getsockopt(struct socket *sock, int level, int optname, 
	int val = 0, len = 0, rc = -EINVAL;



	lock_sock(sk);

	if (level != SOL_LLC)

	if (unlikely(level != SOL_LLC))

		goto out;

	rc = get_user(len, optlen);

	if (rc)

net/llc/llc_conn.c

+6 −6
Original line number Diff line number Diff line
@@ -64,12 +64,12 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb) 
	skb_get(skb);

	ev->ind_prim = ev->cfm_prim = 0;

	rc = llc_conn_service(sk, skb); /* sending event to state machine */

	if (rc) {

	if (unlikely(rc != 0)) {

		printk(KERN_ERR "%s: llc_conn_service failed\n", __FUNCTION__);

		goto out_kfree_skb;

	}



	if (!ev->ind_prim && !ev->cfm_prim) {

	if (unlikely(!ev->ind_prim && !ev->cfm_prim)) {

		/* indicate or confirm not required */

		/* XXX this is not very pretty, perhaps we should store

		 * XXX indicate/confirm-needed state in the llc_conn_state_ev
@@ -80,7 +80,7 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb) 
		goto out_skb_put;

	}



	if (ev->ind_prim && ev->cfm_prim) /* Paranoia */

	if (unlikely(ev->ind_prim && ev->cfm_prim)) /* Paranoia */

		skb_get(skb);



	switch (ev->ind_prim) {
@@ -762,14 +762,14 @@ static int llc_backlog_rcv(struct sock *sk, struct sk_buff *skb) 
	int rc = 0;

	struct llc_sock *llc = llc_sk(sk);



	if (llc_backlog_type(skb) == LLC_PACKET) {

		if (llc->state > 1) /* not closed */

	if (likely(llc_backlog_type(skb) == LLC_PACKET)) {

		if (likely(llc->state > 1)) /* not closed */

			rc = llc_conn_rcv(sk, skb);

		else

			goto out_kfree_skb;

	} else if (llc_backlog_type(skb) == LLC_EVENT) {

		/* timer expiration event */

		if (llc->state > 1)  /* not closed */

		if (likely(llc->state > 1))  /* not closed */

			rc = llc_conn_state_process(sk, skb);

		else

			goto out_kfree_skb;

net/llc/llc_input.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static inline int llc_fixup_skb(struct sk_buff *skb) 
	u8 llc_len = 2;

	struct llc_pdu_sn *pdu;



	if (!pskb_may_pull(skb, sizeof(*pdu)))

	if (unlikely(!pskb_may_pull(skb, sizeof(*pdu))))

		return 0;



	pdu = (struct llc_pdu_sn *)skb->data;