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

Commit f34c5c82 authored by Yi Zou's avatar Yi Zou Committed by David S. Miller
Browse files

ixgbe: Add support for NETIF_F_FCOE_MTU to 82599 devices 



Enable netdev feature flag bit NETIF_F_FCOE_MTU for 82599 devices and enable
jumbo frame correspondingly when NETIF_F_FCOE_MTU is set.

Signed-off-by: default avatarYi Zou <yi.zou@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bb2af4f5

drivers/net/ixgbe/ixgbe_dcb_nl.c

+4 −0
Original line number Diff line number Diff line
@@ -148,8 +148,10 @@ static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state) 
				IXGBE_FCRETA_SIZE;

			netdev->features |= NETIF_F_FCOE_CRC;

			netdev->features |= NETIF_F_FSO;

			netdev->features |= NETIF_F_FCOE_MTU;

			netdev->vlan_features |= NETIF_F_FCOE_CRC;

			netdev->vlan_features |= NETIF_F_FSO;

			netdev->vlan_features |= NETIF_F_FCOE_MTU;

			netdev->fcoe_ddp_xid = IXGBE_FCOE_DDP_MAX - 1;

			netdev_features_change(netdev);

		}
@@ -180,8 +182,10 @@ static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state) 
				adapter->ring_feature[RING_F_FCOE].indices = 0;

				netdev->features &= ~NETIF_F_FCOE_CRC;

				netdev->features &= ~NETIF_F_FSO;

				netdev->features &= ~NETIF_F_FCOE_MTU;

				netdev->vlan_features &= ~NETIF_F_FCOE_CRC;

				netdev->vlan_features &= ~NETIF_F_FSO;

				netdev->vlan_features &= ~NETIF_F_FCOE_MTU;

				netdev->fcoe_ddp_xid = 0;

				netdev_features_change(netdev);

			}

drivers/net/ixgbe/ixgbe_main.c

+3 −3
Original line number Diff line number Diff line
@@ -2026,7 +2026,7 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter) 
	else

		hlreg0 |= IXGBE_HLREG0_JUMBOEN;

#ifdef IXGBE_FCOE

	if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED)

	if (netdev->features & NETIF_F_FCOE_MTU)

		hlreg0 |= IXGBE_HLREG0_JUMBOEN;

#endif

	IXGBE_WRITE_REG(hw, IXGBE_HLREG0, hlreg0);
@@ -2057,7 +2057,7 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter) 
			rx_ring->flags |= IXGBE_RING_RX_PS_ENABLED;



#ifdef IXGBE_FCOE

		if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED) {

		if (netdev->features & NETIF_F_FCOE_MTU) {

			struct ixgbe_ring_feature *f;

			f = &adapter->ring_feature[RING_F_FCOE];

			if ((i >= f->mask) && (i < f->mask + f->indices)) {
@@ -2609,7 +2609,7 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter) 


#ifdef IXGBE_FCOE

	/* adjust max frame to be able to do baby jumbo for FCoE */

	if ((adapter->flags & IXGBE_FLAG_FCOE_ENABLED) &&

	if ((netdev->features & NETIF_F_FCOE_MTU) &&

	    (max_frame < IXGBE_FCOE_JUMBO_FRAME_SIZE))

		max_frame = IXGBE_FCOE_JUMBO_FRAME_SIZE;