---

yaml
---
r: 135183
b: refs/heads/master
c: 8db09f2
h: refs/heads/master
i:
  135181: 310a2b8
  135179: 91244c3
  135175: 409d383
  135167: 2e3fa83
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73ce7b01b4496a5fbf9caf63033c874be692333f
+refs/heads/master: 8db09f26f912f7c90c764806e804b558da520d4f

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++;