svn commit: r294918 - stable/10/sys/dev/mlx5/mlx5_en
Hans Petter Selasky
hselasky at FreeBSD.org
Wed Jan 27 14:57:38 UTC 2016
Author: hselasky
Date: Wed Jan 27 14:57:37 2016
New Revision: 294918
URL: https://svnweb.freebsd.org/changeset/base/294918
Log:
MFC r294317:
Declare local variables at top of function.
Sponsored by: Mellanox Technologies
Differential Revision: https://reviews.freebsd.org/D4939
Modified:
stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c
==============================================================================
--- stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c Wed Jan 27 14:55:41 2016 (r294917)
+++ stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c Wed Jan 27 14:57:37 2016 (r294918)
@@ -100,20 +100,23 @@ mlx5e_lro_update_hdr(struct mbuf *mb, st
/* TODO: consider vlans, ip options, ... */
struct ether_header *eh;
uint16_t eh_type;
+ uint16_t tot_len;
struct ip6_hdr *ip6 = NULL;
struct ip *ip4 = NULL;
struct tcphdr *th;
uint32_t *ts_ptr;
+ uint8_t l4_hdr_type;
+ int tcp_ack;
eh = mtod(mb, struct ether_header *);
eh_type = ntohs(eh->ether_type);
- u8 l4_hdr_type = get_cqe_l4_hdr_type(cqe);
- int tcp_ack = ((CQE_L4_HDR_TYPE_TCP_ACK_NO_DATA == l4_hdr_type) ||
+ l4_hdr_type = get_cqe_l4_hdr_type(cqe);
+ tcp_ack = ((CQE_L4_HDR_TYPE_TCP_ACK_NO_DATA == l4_hdr_type) ||
(CQE_L4_HDR_TYPE_TCP_ACK_AND_DATA == l4_hdr_type));
/* TODO: consider vlan */
- u16 tot_len = be32_to_cpu(cqe->byte_cnt) - ETHER_HDR_LEN;
+ tot_len = be32_to_cpu(cqe->byte_cnt) - ETHER_HDR_LEN;
switch (eh_type) {
case ETHERTYPE_IP:
More information about the svn-src-stable-10
mailing list