Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67a74ee2 authored by Emil Tantilov's avatar Emil Tantilov Committed by Jeff Kirsher
Browse files

ixgbe: add rxhash support 



feed RSS hash into skb->rxhash

Signed-off-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
Tested-by: default avatarEvan Swanson <evan.swanson@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 936db355

drivers/net/ixgbe/ixgbe_ethtool.c

+6 −1
Original line number Diff line number Diff line
@@ -2253,8 +2253,13 @@ static int ixgbe_set_flags(struct net_device *netdev, u32 data) 
	need_reset = (data & ETH_FLAG_RXVLAN) !=

		     (netdev->features & NETIF_F_HW_VLAN_RX);



	if ((data & ETH_FLAG_RXHASH) &&

	    !(adapter->flags & IXGBE_FLAG_RSS_ENABLED))

		return -EOPNOTSUPP;



	rc = ethtool_op_set_flags(netdev, data, ETH_FLAG_LRO | ETH_FLAG_NTUPLE |

					ETH_FLAG_RXVLAN | ETH_FLAG_TXVLAN);

				  ETH_FLAG_RXVLAN | ETH_FLAG_TXVLAN |

				  ETH_FLAG_RXHASH);

	if (rc)

		return rc;

drivers/net/ixgbe/ixgbe_main.c

+13 −1
Original line number Diff line number Diff line
@@ -1063,8 +1063,14 @@ static int __ixgbe_notify_dca(struct device *dev, void *data) 


	return 0;

}



#endif /* CONFIG_IXGBE_DCA */



static inline void ixgbe_rx_hash(union ixgbe_adv_rx_desc *rx_desc,

				 struct sk_buff *skb)

{

	skb->rxhash = le32_to_cpu(rx_desc->wb.lower.hi_dword.rss);

}



/**

 * ixgbe_receive_skb - Send a completed packet up the stack

 * @adapter: board private structure
@@ -1456,6 +1462,8 @@ static void ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector, 
		}



		ixgbe_rx_checksum(adapter, rx_desc, skb);

		if (adapter->netdev->features & NETIF_F_RXHASH)

			ixgbe_rx_hash(rx_desc, skb);



		/* probably a little skewed due to removing CRC */

		total_rx_bytes += skb->len;
@@ -7361,6 +7369,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, 
	netdev->features |= NETIF_F_TSO;

	netdev->features |= NETIF_F_TSO6;

	netdev->features |= NETIF_F_GRO;

	netdev->features |= NETIF_F_RXHASH;



	switch (adapter->hw.mac.type) {

	case ixgbe_mac_82599EB:
@@ -7441,6 +7450,9 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, 
	if (err)

		goto err_sw_init;



	if (!(adapter->flags & IXGBE_FLAG_RSS_ENABLED))

		netdev->features &= ~NETIF_F_RXHASH;



	switch (pdev->device) {

	case IXGBE_DEV_ID_82599_SFP:

		/* Only this subdevice supports WOL */