| Message ID | 1516323902-15852-2-git-send-email-tlfalcon@linux.vnet.ibm.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] ibmvnic: Fix IPv6 packet descriptors | expand |
On 01/18/2018 07:05 PM, Thomas Falcon wrote: > Packet descriptor generation for IPv6 is broken. > Properly set L3 and L4 protocol flags for IPv6 descriptors. > > Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com> Sorry! Forgot to check for formatting. Please ignore this patch. > --- > drivers/net/ethernet/ibm/ibmvnic.c | 22 ++++++++++++---------- > 1 file changed, 12 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c > index 3700bfa..4bb41cd 100644 > --- a/drivers/net/ethernet/ibm/ibmvnic.c > +++ b/drivers/net/ethernet/ibm/ibmvnic.c > @@ -1281,6 +1281,7 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) > u64 *handle_array; > int index = 0; > int ret = 0; > + u8 proto = 0; > > if (adapter->resetting) { > if (!netif_subqueue_stopped(netdev, skb)) > @@ -1367,18 +1368,19 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) > tx_crq.v1.vlan_id = cpu_to_be16(skb->vlan_tci); > } > > - 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) > - tx_crq.v1.flags1 |= IBMVNIC_TX_PROT_IPV6; > - > - if (ip_hdr(skb)->protocol == IPPROTO_TCP) > - tx_crq.v1.flags1 |= IBMVNIC_TX_PROT_TCP; > - else if (ip_hdr(skb)->protocol != IPPROTO_TCP) > - tx_crq.v1.flags1 |= IBMVNIC_TX_PROT_UDP; > + if (skb->protocol == htons(ETH_P_IP)) { > + tx_crq.v1.flags1 |= IBMVNIC_TX_PROT_IPV4; > + 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 (proto == IPPROTO_TCP) > + tx_crq.v1.flags1 |= IBMVNIC_TX_PROT_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; > hdrs += 2;
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 3700bfa..4bb41cd 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -1281,6 +1281,7 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) u64 *handle_array; int index = 0; int ret = 0; + u8 proto = 0; if (adapter->resetting) { if (!netif_subqueue_stopped(netdev, skb)) @@ -1367,18 +1368,19 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) tx_crq.v1.vlan_id = cpu_to_be16(skb->vlan_tci); } - 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) - tx_crq.v1.flags1 |= IBMVNIC_TX_PROT_IPV6; - - if (ip_hdr(skb)->protocol == IPPROTO_TCP) - tx_crq.v1.flags1 |= IBMVNIC_TX_PROT_TCP; - else if (ip_hdr(skb)->protocol != IPPROTO_TCP) - tx_crq.v1.flags1 |= IBMVNIC_TX_PROT_UDP; + if (skb->protocol == htons(ETH_P_IP)) { + tx_crq.v1.flags1 |= IBMVNIC_TX_PROT_IPV4; + 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 (proto == IPPROTO_TCP) + tx_crq.v1.flags1 |= IBMVNIC_TX_PROT_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; hdrs += 2;
Packet descriptor generation for IPv6 is broken. Properly set L3 and L4 protocol flags for IPv6 descriptors. Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com> --- drivers/net/ethernet/ibm/ibmvnic.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)