ixgbe: fix bug where lro settings are per ring (e9990a9c) · Commits · 戴 / test

drivers/net/ixgbe/ixgbe_main.c

+14 −13

Original line number	Diff line number	Diff line
		@@ -1428,8 +1428,8 @@ static int ixgbe_get_skb_hdr(struct sk_buff skb, void iphdr, void *tcph,
		union ixgbe_adv_rx_desc *rx_desc = priv;

		/* Verify that this is a valid IPv4 TCP packet */
		if (!(ixgbe_get_pkt_info(rx_desc) &
		(IXGBE_RXDADV_PKTTYPE_IPV4 \| IXGBE_RXDADV_PKTTYPE_TCP)))
		if (!((ixgbe_get_pkt_info(rx_desc) & IXGBE_RXDADV_PKTTYPE_IPV4) &&
		(ixgbe_get_pkt_info(rx_desc) & IXGBE_RXDADV_PKTTYPE_TCP)))
		return -1;

		/* Set network headers */
		@@ -1532,8 +1532,6 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)
		adapter->rx_ring[i].head = IXGBE_RDH(j);
		adapter->rx_ring[i].tail = IXGBE_RDT(j);
		adapter->rx_ring[i].rx_buf_len = rx_buf_len;
		}

		/* Intitial LRO Settings */
		adapter->rx_ring[i].lro_mgr.max_aggr = IXGBE_MAX_LRO_AGGREGATE;
		adapter->rx_ring[i].lro_mgr.max_desc = IXGBE_MAX_LRO_DESCRIPTORS;
		@@ -1544,6 +1542,8 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)
		adapter->rx_ring[i].lro_mgr.dev = adapter->netdev;
		adapter->rx_ring[i].lro_mgr.ip_summed = CHECKSUM_UNNECESSARY;
		adapter->rx_ring[i].lro_mgr.ip_summed_aggr = CHECKSUM_UNNECESSARY;
		}


		if (adapter->flags & IXGBE_FLAG_RSS_ENABLED) {
		/* Fill out redirection table */
		@@ -3618,9 +3618,10 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
		NETIF_F_HW_VLAN_RX \|
		NETIF_F_HW_VLAN_FILTER;

		netdev->features \|= NETIF_F_LRO;
		netdev->features \|= NETIF_F_IPV6_CSUM;
		netdev->features \|= NETIF_F_TSO;
		netdev->features \|= NETIF_F_TSO6;
		netdev->features \|= NETIF_F_LRO;

		netdev->vlan_features \|= NETIF_F_TSO;
		netdev->vlan_features \|= NETIF_F_TSO6;

Admin message