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

Commit 65bc0cfe authored by Dmitry Kravkov's avatar Dmitry Kravkov Committed by David S. Miller
Browse files

bnx2x: allow handling tunnel over udp offload 



CC: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: default avatarDmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f6ace502

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+5 −0
Original line number Diff line number Diff line
@@ -3530,6 +3530,11 @@ static void bnx2x_update_pbds_gso_enc(struct sk_buff *skb, 
			ETH_TX_PARSE_2ND_BD_IP_HDR_LEN_OUTER_W_SHIFT) |

		((skb->protocol == cpu_to_be16(ETH_P_8021Q)) <<

			ETH_TX_PARSE_2ND_BD_LLC_SNAP_EN_SHIFT);



	if (ip_hdr(skb)->protocol == IPPROTO_UDP) {

		SET_FLAG(*global_data, ETH_TX_PARSE_2ND_BD_TUNNEL_UDP_EXIST, 1);

		pbd2->tunnel_udp_hdr_start_w = skb_transport_offset(skb) >> 1;

	}

}



/* called with netif_tx_lock

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+2 −2
Original line number Diff line number Diff line
@@ -12043,11 +12043,11 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev, 
		NETIF_F_RXCSUM | NETIF_F_LRO | NETIF_F_GRO |

		NETIF_F_RXHASH | NETIF_F_HW_VLAN_CTAG_TX;

	if (!CHIP_IS_E1x(bp)) {

		dev->hw_features |= NETIF_F_GSO_GRE;

		dev->hw_features |= NETIF_F_GSO_GRE | NETIF_F_GSO_UDP_TUNNEL;

		dev->hw_enc_features =

			NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_SG |

			NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6 |

			NETIF_F_GSO_GRE;

			NETIF_F_GSO_GRE | NETIF_F_GSO_UDP_TUNNEL;

	}



	dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |