OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[android-x86/kernel.git]
/
drivers
/
net
/
ethernet
/
broadcom
/
genet
/
bcmgenet.c
diff --git
a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index
28c8111
..
417ce68
100644
(file)
--- a/
drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/
drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@
-1147,6
+1147,11
@@
static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev)
goto out;
}
+ if (skb_padto(skb, ETH_ZLEN)) {
+ ret = NETDEV_TX_OK;
+ goto out;
+ }
+
/* set the SKB transmit checksum */
if (priv->desc_64b_en) {
ret = bcmgenet_put_tx_csum(dev, skb);