summaryrefslogtreecommitdiffstats
path: root/net/llc/llc_if.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2005-09-22 04:32:10 -0300
committerArnaldo Carvalho de Melo <acme@mandriva.com>2005-09-22 04:32:10 -0300
commit249ff1c6d35fd32ca945967c3f0b948210a96baa (patch)
treeb7f13f3a7c0d09d523e86ccac3dce0856288f726 /net/llc/llc_if.c
parent590232a7150674b2036291eaefce085f3f9659c8 (diff)
downloadlinux-249ff1c6d35fd32ca945967c3f0b948210a96baa.tar.bz2
[LLC]: Use some more likely/unlikely
Signed-off-by: Jochen Friedrich <jochen@scram.de> Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Diffstat (limited to 'net/llc/llc_if.c')
-rw-r--r--net/llc/llc_if.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/net/llc/llc_if.c b/net/llc/llc_if.c
index 0f84f66018e4..764dbd704051 100644
--- a/net/llc/llc_if.c
+++ b/net/llc/llc_if.c
@@ -47,14 +47,11 @@ int llc_build_and_send_pkt(struct sock *sk, struct sk_buff *skb)
int rc = -ECONNABORTED;
struct llc_sock *llc = llc_sk(sk);
- if (llc->state == LLC_CONN_STATE_ADM)
+ if (unlikely(llc->state == LLC_CONN_STATE_ADM))
goto out;
rc = -EBUSY;
- if (llc_data_accept_state(llc->state)) { /* data_conn_refuse */
- llc->failed_data_req = 1;
- goto out;
- }
- if (llc->p_flag) {
+ if (unlikely(llc_data_accept_state(llc->state) || /* data_conn_refuse */
+ llc->p_flag)) {
llc->failed_data_req = 1;
goto out;
}