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

Commit 031b8c6d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'aquantia-fixes' 



Pavel Belous says:

====================
net:ethernet:aquantia: Misc fixes for atlantic driver.

The following patchset containg several fixes for aQuantia AQtion driver
for net tree: A couple fixes for IPv6 and other fixes.

v1->v2: Fix compilation error (using HW_ATL_A0_TXD_CTL_CMD_IPV6 instead
        HW_ATL_B0_TXD_CTL_CMD_IPV6).
v2->v3: Added "Fixes" tags.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2f25abe6 5d73bb86

drivers/net/ethernet/aquantia/atlantic/aq_main.c

+0 −5
Original line number Diff line number Diff line
@@ -100,11 +100,6 @@ static int aq_ndev_change_mtu(struct net_device *ndev, int new_mtu) 
		goto err_exit;

	ndev->mtu = new_mtu;



	if (netif_running(ndev)) {

		aq_ndev_close(ndev);

		aq_ndev_open(ndev);

	}



err_exit:

	return err;

}

drivers/net/ethernet/aquantia/atlantic/aq_nic.c

+19 −4
Original line number Diff line number Diff line
@@ -487,6 +487,9 @@ static unsigned int aq_nic_map_skb(struct aq_nic_s *self, 
		dx_buff->mss = skb_shinfo(skb)->gso_size;

		dx_buff->is_txc = 1U;



		dx_buff->is_ipv6 =

			(ip_hdr(skb)->version == 6) ? 1U : 0U;



		dx = aq_ring_next_dx(ring, dx);

		dx_buff = &ring->buff_ring[dx];

		++ret;
@@ -510,10 +513,22 @@ static unsigned int aq_nic_map_skb(struct aq_nic_s *self, 
	if (skb->ip_summed == CHECKSUM_PARTIAL) {

		dx_buff->is_ip_cso = (htons(ETH_P_IP) == skb->protocol) ?

			1U : 0U;



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

			dx_buff->is_tcp_cso =

			(ip_hdr(skb)->protocol == IPPROTO_TCP) ? 1U : 0U;

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

					1U : 0U;

			dx_buff->is_udp_cso =

			(ip_hdr(skb)->protocol == IPPROTO_UDP) ? 1U : 0U;

				(ip_hdr(skb)->protocol == IPPROTO_UDP) ?

					1U : 0U;

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

			dx_buff->is_tcp_cso =

				(ipv6_hdr(skb)->nexthdr == NEXTHDR_TCP) ?

					1U : 0U;

			dx_buff->is_udp_cso =

				(ipv6_hdr(skb)->nexthdr == NEXTHDR_UDP) ?

					1U : 0U;

		}

	}



	for (; nr_frags--; ++frag_count) {

drivers/net/ethernet/aquantia/atlantic/aq_ring.c

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ int aq_ring_init(struct aq_ring_s *self) 
	self->hw_head = 0;

	self->sw_head = 0;

	self->sw_tail = 0;

	spin_lock_init(&self->header.lock);

	return 0;

}

drivers/net/ethernet/aquantia/atlantic/aq_ring.h

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ struct __packed aq_ring_buff_s { 
			u8 len_l2;

			u8 len_l3;

			u8 len_l4;

			u8 rsvd2;

			u8 is_ipv6:1;

			u8 rsvd2:7;

			u32 len_pkt;

		};

	};

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c

+4 −0
Original line number Diff line number Diff line
@@ -433,6 +433,9 @@ static int hw_atl_a0_hw_ring_tx_xmit(struct aq_hw_s *self, 
				    buff->len_l3 +

				    buff->len_l2);

			is_gso = true;



			if (buff->is_ipv6)

				txd->ctl |= HW_ATL_A0_TXD_CTL_CMD_IPV6;

		} else {

			buff_pa_len = buff->len;
@@ -458,6 +461,7 @@ static int hw_atl_a0_hw_ring_tx_xmit(struct aq_hw_s *self, 
			if (unlikely(buff->is_eop)) {

				txd->ctl |= HW_ATL_A0_TXD_CTL_EOP;

				txd->ctl |= HW_ATL_A0_TXD_CTL_CMD_WB;

				is_gso = false;

			}

		}