Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
net
/
ethernet
/
ti
/
cpmac.c
diff --git
a/kernel/drivers/net/ethernet/ti/cpmac.c
b/kernel/drivers/net/ethernet/ti/cpmac.c
index
77d26fe
..
d52ea30
100644
(file)
--- a/
kernel/drivers/net/ethernet/ti/cpmac.c
+++ b/
kernel/drivers/net/ethernet/ti/cpmac.c
@@
-549,7
+549,8
@@
fatal_error:
static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
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);
struct cpmac_desc *desc;
struct cpmac_priv *priv = netdev_priv(dev);
@@
-559,7
+560,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;
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);
queue = skb_get_queue_mapping(skb);
netif_stop_subqueue(dev, queue);