diff options
| author | David S. Miller <davem@davemloft.net> | 2012-09-28 14:40:49 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-28 14:40:49 -0400 |
| commit | 6a06e5e1bb217be077e1f8ee2745b4c5b1aa02db (patch) | |
| tree | 8faea23112a11f52524eb413f71b7b02712d8b53 /drivers/net/ethernet/intel/e1000 | |
| parent | d9f72f359e00a45a6cd7cc2d5121b04b9dc927e1 (diff) | |
| parent | 6672d90fe779dc0dfffe027c3ede12609df091c2 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/team/team.c
drivers/net/usb/qmi_wwan.c
net/batman-adv/bat_iv_ogm.c
net/ipv4/fib_frontend.c
net/ipv4/route.c
net/l2tp/l2tp_netlink.c
The team, fib_frontend, route, and l2tp_netlink conflicts were simply
overlapping changes.
qmi_wwan and bat_iv_ogm were of the "use HEAD" variety.
With help from Antonio Quartulli.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000_main.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c index 3a8368e42ede..f9ac229ce222 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c | |||
| @@ -3150,6 +3150,17 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, | |||
| 3150 | return NETDEV_TX_OK; | 3150 | return NETDEV_TX_OK; |
| 3151 | } | 3151 | } |
| 3152 | 3152 | ||
| 3153 | /* On PCI/PCI-X HW, if packet size is less than ETH_ZLEN, | ||
| 3154 | * packets may get corrupted during padding by HW. | ||
| 3155 | * To WA this issue, pad all small packets manually. | ||
| 3156 | */ | ||
| 3157 | if (skb->len < ETH_ZLEN) { | ||
| 3158 | if (skb_pad(skb, ETH_ZLEN - skb->len)) | ||
| 3159 | return NETDEV_TX_OK; | ||
| 3160 | skb->len = ETH_ZLEN; | ||
| 3161 | skb_set_tail_pointer(skb, ETH_ZLEN); | ||
| 3162 | } | ||
| 3163 | |||
| 3153 | mss = skb_shinfo(skb)->gso_size; | 3164 | mss = skb_shinfo(skb)->gso_size; |
| 3154 | /* The controller does a simple calculation to | 3165 | /* The controller does a simple calculation to |
| 3155 | * make sure there is enough room in the FIFO before | 3166 | * make sure there is enough room in the FIFO before |