From 9556e8e2dd674a04f629dc3f221d4d744de14d83 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Fri, 13 Mar 2009 16:04:12 -0700 Subject: [PATCH] --- yaml --- r: 135183 b: refs/heads/master c: 8db09f26f912f7c90c764806e804b558da520d4f h: refs/heads/master i: 135181: 310a2b8547a172956988bd5a0f50f9ac2d55600c 135179: 91244c3ad32ecfbe3ff22e3a4c31003e3952a06e 135175: 409d38307289fe67c43d780569b26614f7718526 135167: 2e3fa839e5d5bbce1870a1480804e1abcc3f411a v: v3 --- [refs] | 2 +- trunk/net/x25/af_x25.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 0cb6deb741d9..fe696bde8f4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73ce7b01b4496a5fbf9caf63033c874be692333f +refs/heads/master: 8db09f26f912f7c90c764806e804b558da520d4f diff --git a/trunk/net/x25/af_x25.c b/trunk/net/x25/af_x25.c index 1000e9a26fdb..9ca17b1ce52e 100644 --- a/trunk/net/x25/af_x25.c +++ b/trunk/net/x25/af_x25.c @@ -951,10 +951,8 @@ int x25_rx_call_request(struct sk_buff *skb, struct x25_neigh *nb, /* * Incoming Call User Data. */ - if (skb->len >= 0) { - skb_copy_from_linear_data(skb, makex25->calluserdata.cuddata, skb->len); - makex25->calluserdata.cudlength = skb->len; - } + skb_copy_from_linear_data(skb, makex25->calluserdata.cuddata, skb->len); + makex25->calluserdata.cudlength = skb->len; sk->sk_ack_backlog++; @@ -1122,8 +1120,9 @@ static int x25_sendmsg(struct kiocb *iocb, struct socket *sock, if (msg->msg_flags & MSG_OOB) skb_queue_tail(&x25->interrupt_out_queue, skb); else { - len = x25_output(sk, skb); - if (len < 0) + rc = x25_output(sk, skb); + len = rc; + if (rc < 0) kfree_skb(skb); else if (x25->qbitincl) len++;