* using min() macro Signed-off-by: Aristeu Sergio Rozanski Filho Index: net/x25/x25_out.c =================================================================== --- net/x25/x25_out.c (revision 88) +++ net/x25/x25_out.c (revision 89) @@ -65,12 +65,15 @@ { struct sk_buff *skbn; unsigned char header[X25_EXT_MIN_LEN]; - int err, frontlen, len; + int err, frontlen; int sent=0, noblock = X25_SKB_CB(skb)->flags & MSG_DONTWAIT; struct x25_opt *x25 = x25_sk(sk); int header_len = x25->neighbour->extended ? X25_EXT_MIN_LEN : X25_STD_MIN_LEN; - int max_len = x25_pacsize_to_bytes(x25->facilities.pacsize_out); + unsigned int len, + max_len; + + max_len = x25_pacsize_to_bytes(x25->facilities.pacsize_out); if (skb->len - header_len > max_len) { /* Save a copy of the Header */ @@ -94,7 +97,7 @@ skb_reserve(skbn, frontlen); - len = max_len > skb->len ? skb->len : max_len; + len = min(max_len, skb->len); /* Copy the user data */ memcpy(skb_put(skbn, len), skb->data, len);