unsigned long size;
unsigned int i;
- /* Free all the Rx ring sk_buffs */
+ if (!rx_ring->rx_buffer_info)
+ return;
+ /* Free all the Rx ring sk_buffs */
for (i = 0; i < rx_ring->count; i++) {
struct ixgbevf_rx_buffer *rx_buffer_info;
unsigned long size;
unsigned int i;
+ if (!tx_ring->tx_buffer_info)
+ return;
+
/* Free all the Tx ring sk_buffs */
for (i = 0; i < tx_ring->count; i++) {
void ixgbevf_reinit_locked(struct ixgbevf_adapter *adapter)
{
+ struct ixgbe_hw *hw = &adapter->hw;
+
WARN_ON(in_interrupt());
+
while (test_and_set_bit(__IXGBEVF_RESETTING, &adapter->state))
msleep(1);
- ixgbevf_down(adapter);
- ixgbevf_up(adapter);
+ /*
+ * Check if PF is up before re-init. If not then skip until
+ * later when the PF is up and ready to service requests from
+ * the VF via mailbox. If the VF is up and running then the
+ * watchdog task will continue to schedule reset tasks until
+ * the PF is up and running.
+ */
+ if (!hw->mac.ops.reset_hw(hw)) {
+ ixgbevf_down(adapter);
+ ixgbevf_up(adapter);
+ }
clear_bit(__IXGBEVF_RESETTING, &adapter->state);
}
&link_up, false)) != 0) {
adapter->link_up = link_up;
adapter->link_speed = link_speed;
+ netif_carrier_off(netdev);
+ netif_tx_stop_all_queues(netdev);
schedule_work(&adapter->reset_task);
goto pf_has_reset;
}
{
struct pci_dev *pdev = adapter->pdev;
-
ixgbevf_clean_tx_ring(adapter, tx_ring);
vfree(tx_ring->tx_buffer_info);
IPPROTO_TCP,
0);
adapter->hw_tso_ctxt++;
- } else if (skb_shinfo(skb)->gso_type == SKB_GSO_TCPV6) {
+ } else if (skb_is_gso_v6(skb)) {
ipv6_hdr(skb)->payload_len = 0;
tcp_hdr(skb)->check =
~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,