diff options
Diffstat (limited to 'drivers/net/epic100.c')
| -rw-r--r-- | drivers/net/epic100.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c index 8d680ce600d7..724d7dc35fa3 100644 --- a/drivers/net/epic100.c +++ b/drivers/net/epic100.c | |||
| @@ -1027,11 +1027,8 @@ static int epic_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 1027 | u32 ctrl_word; | 1027 | u32 ctrl_word; |
| 1028 | unsigned long flags; | 1028 | unsigned long flags; |
| 1029 | 1029 | ||
| 1030 | if (skb->len < ETH_ZLEN) { | 1030 | if (skb_padto(skb, ETH_ZLEN)) |
| 1031 | skb = skb_padto(skb, ETH_ZLEN); | 1031 | return 0; |
| 1032 | if (skb == NULL) | ||
| 1033 | return 0; | ||
| 1034 | } | ||
| 1035 | 1032 | ||
| 1036 | /* Caution: the write order is important here, set the field with the | 1033 | /* Caution: the write order is important here, set the field with the |
| 1037 | "ownership" bit last. */ | 1034 | "ownership" bit last. */ |
