Author: np
Date: Tue Apr 30 07:53:15 2019
New Revision: 346950
URL: https://svnweb.freebsd.org/changeset/base/346950
Log:
MFC r343569, r345307
r343569:
cxgbe/iw_cxgbe: Fix an address calculation in the memory registration code
that
was added in r342266.
Submitted by: Krishnamraju Eraparaju @ Chelsio
Sponsored by: Chelsio Communications
r345307:
iw_cxgbe: Remove unused smac_idx from the ep structure.
Submitted by: Krishnamraju Eraparaju @ Chelsio
Modified:
stable/11/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h
stable/11/sys/dev/cxgbe/iw_cxgbe/mem.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h
==============================================================================
--- stable/11/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h Tue Apr 30 07:45:07 2019
(r346949)
+++ stable/11/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h Tue Apr 30 07:53:15 2019
(r346950)
@@ -857,7 +857,6 @@ struct c4iw_ep {
unsigned int mpa_pkt_len;
u32 ird;
u32 ord;
- u32 smac_idx;
u32 tx_chan;
u32 mtu;
u16 mss;
Modified: stable/11/sys/dev/cxgbe/iw_cxgbe/mem.c
==============================================================================
--- stable/11/sys/dev/cxgbe/iw_cxgbe/mem.c Tue Apr 30 07:45:07 2019
(r346949)
+++ stable/11/sys/dev/cxgbe/iw_cxgbe/mem.c Tue Apr 30 07:53:15 2019
(r346950)
@@ -205,7 +205,7 @@ _c4iw_write_mem_dma(struct c4iw_rdev *rdev, u32 addr,
if (ret)
goto out;
addr += dmalen >> 5;
- data = (u64 *)data + dmalen;
+ data = (u8 *)data + dmalen;
daddr = daddr + dmalen;
}
if (remain)
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
