diff options
author | Raghu Vatsavayi <rvatsavayi@caviumnetworks.com> | 2016-06-15 02:54:49 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-06-16 07:44:32 +0300 |
commit | 7275ebfc504c068a1250e0fa51f896e493b0edfa (patch) | |
tree | 9f1280653403b55d26d84d1dc98f318d0ea44bcf /drivers/net/ethernet/cavium/liquidio/octeon_nic.h | |
parent | a5b3788881289148ac34e6aeeb678fadee644bc9 (diff) | |
download | linux-7275ebfc504c068a1250e0fa51f896e493b0edfa.tar.xz |
liquidio: New driver FW command structure
This patch is for new driver/firmware control command structure
(octnic_packet_params and octnic_cmd_setup ) and resultant code changes.
Signed-off-by: Derek Chickles <derek.chickles@caviumnetworks.com>
Signed-off-by: Satanand Burla <satananda.burla@caviumnetworks.com>
Signed-off-by: Felix Manlunas <felix.manlunas@caviumnetworks.com>
Signed-off-by: Raghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cavium/liquidio/octeon_nic.h')
-rw-r--r-- | drivers/net/ethernet/cavium/liquidio/octeon_nic.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_nic.h b/drivers/net/ethernet/cavium/liquidio/octeon_nic.h index 0238857c8105..a61dea35a102 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_nic.h +++ b/drivers/net/ethernet/cavium/liquidio/octeon_nic.h @@ -94,15 +94,15 @@ struct octnic_data_pkt { */ union octnic_cmd_setup { struct { - u32 ifidx:8; - u32 cksum_offset:7; + u32 iq_no:8; u32 gather:1; u32 timestamp:1; - u32 ipv4opts_ipv6exthdr:2; u32 ip_csum:1; + u32 transport_csum:1; u32 tnl_csum:1; - + u32 ifidx:8; u32 rsvd:11; + union { u32 datasize; u32 gatherptrs; @@ -172,13 +172,8 @@ octnet_prepare_pci_cmd(struct octeon_instr_64B *cmd, packet_params.u32 = 0; - if (setup->s.cksum_offset) { - packet_params.s.csoffset = setup->s.cksum_offset; - packet_params.s.ipv4opts_ipv6exthdr = - setup->s.ipv4opts_ipv6exthdr; - } - packet_params.s.ip_csum = setup->s.ip_csum; + packet_params.s.transport_csum = setup->s.transport_csum; packet_params.s.tnl_csum = setup->s.tnl_csum; packet_params.s.ifidx = setup->s.ifidx; packet_params.s.tsflag = setup->s.timestamp; |