|
@@ -546,7 +546,8 @@ fatal_error:
|
|
|
|
|
|
static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
|
{
|
|
|
- int queue, len;
|
|
|
+ int queue;
|
|
|
+ unsigned int len;
|
|
|
struct cpmac_desc *desc;
|
|
|
struct cpmac_priv *priv = netdev_priv(dev);
|
|
|
|
|
@@ -556,7 +557,7 @@ static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
|
if (unlikely(skb_padto(skb, ETH_ZLEN)))
|
|
|
return NETDEV_TX_OK;
|
|
|
|
|
|
- len = max(skb->len, ETH_ZLEN);
|
|
|
+ len = max_t(unsigned int, skb->len, ETH_ZLEN);
|
|
|
queue = skb_get_queue_mapping(skb);
|
|
|
netif_stop_subqueue(dev, queue);
|
|
|
|