|
@@ -7162,11 +7162,27 @@ out_drop:
|
|
|
return NETDEV_TX_OK;
|
|
|
}
|
|
|
|
|
|
-static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
|
|
|
+static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb,
|
|
|
+ struct net_device *netdev)
|
|
|
{
|
|
|
struct ixgbe_adapter *adapter = netdev_priv(netdev);
|
|
|
struct ixgbe_ring *tx_ring;
|
|
|
|
|
|
+ if (skb->len <= 0) {
|
|
|
+ dev_kfree_skb_any(skb);
|
|
|
+ return NETDEV_TX_OK;
|
|
|
+ }
|
|
|
+
|
|
|
+ /*
|
|
|
+ * The minimum packet size for olinfo paylen is 17 so pad the skb
|
|
|
+ * in order to meet this minimum size requirement.
|
|
|
+ */
|
|
|
+ if (skb->len < 17) {
|
|
|
+ if (skb_padto(skb, 17))
|
|
|
+ return NETDEV_TX_OK;
|
|
|
+ skb->len = 17;
|
|
|
+ }
|
|
|
+
|
|
|
tx_ring = adapter->tx_ring[skb->queue_mapping];
|
|
|
return ixgbe_xmit_frame_ring(skb, adapter, tx_ring);
|
|
|
}
|