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

Commit a0dca10f authored by Thomas Falcon's avatar Thomas Falcon Committed by David S. Miller
Browse files

ibmvnic: Fix IPv6 packet descriptors 



Packet descriptor generation for IPv6 is broken.
Properly set L3 and L4 protocol flags for IPv6 descriptors.

Signed-off-by: default avatarThomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f6897943

drivers/net/ethernet/ibm/ibmvnic.c

+11 −9
Original line number Diff line number Diff line
@@ -1276,6 +1276,7 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) 
	unsigned char *dst;

	u64 *handle_array;

	int index = 0;

	u8 proto = 0;

	int ret = 0;



	if (adapter->resetting) {
@@ -1364,16 +1365,17 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) 
	}



	if (skb->protocol == htons(ETH_P_IP)) {

		if (ip_hdr(skb)->version == 4)

		tx_crq.v1.flags1 |= IBMVNIC_TX_PROT_IPV4;

		else if (ip_hdr(skb)->version == 6)

		proto = ip_hdr(skb)->protocol;

	} else if (skb->protocol == htons(ETH_P_IPV6)) {

		tx_crq.v1.flags1 |= IBMVNIC_TX_PROT_IPV6;

		proto = ipv6_hdr(skb)->nexthdr;

	}



		if (ip_hdr(skb)->protocol == IPPROTO_TCP)

	if (proto == IPPROTO_TCP)

		tx_crq.v1.flags1 |= IBMVNIC_TX_PROT_TCP;

		else if (ip_hdr(skb)->protocol != IPPROTO_TCP)

	else if (proto == IPPROTO_UDP)

		tx_crq.v1.flags1 |= IBMVNIC_TX_PROT_UDP;

	}



	if (skb->ip_summed == CHECKSUM_PARTIAL) {

		tx_crq.v1.flags1 |= IBMVNIC_TX_CHKSUM_OFFLOAD;