From fac79d9f6ce54225d9d11f458a09c83073f1594c Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 23 Aug 2007 03:04:12 -0400 Subject: [PATCH] --- yaml --- r: 66671 b: refs/heads/master c: fb8e4444cc8c7719d9947e21a93e2e84bb1b36eb h: refs/heads/master i: 66669: 0540cb829419cab602a2d7d0b04b0e6630a07b54 66667: 8c1456de013ce92afaff90ee8f2050931f63709c 66663: 95bef251975fd2363e814f5df472c43a15869720 66655: f17822798433747832ea8865a5d89751f91eec35 v: v3 --- [refs] | 2 +- trunk/drivers/net/cxgb3/common.h | 4 ++-- trunk/drivers/net/cxgb3/sge.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 793fd6cbb7e3..778e8bc0d8e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd7eb1c549188e4f7993e324b1bbe267fc13675c +refs/heads/master: fb8e4444cc8c7719d9947e21a93e2e84bb1b36eb diff --git a/trunk/drivers/net/cxgb3/common.h b/trunk/drivers/net/cxgb3/common.h index 3e5b0db7784e..99c75d30f67a 100644 --- a/trunk/drivers/net/cxgb3/common.h +++ b/trunk/drivers/net/cxgb3/common.h @@ -168,8 +168,8 @@ enum { }; struct sg_ent { /* SGE scatter/gather entry */ - u32 len[2]; - u64 addr[2]; + __be32 len[2]; + __be64 addr[2]; }; #ifndef SGE_NUM_GENBITS diff --git a/trunk/drivers/net/cxgb3/sge.c b/trunk/drivers/net/cxgb3/sge.c index 540ce5fa1d32..77f3ec5ff8a7 100644 --- a/trunk/drivers/net/cxgb3/sge.c +++ b/trunk/drivers/net/cxgb3/sge.c @@ -79,7 +79,7 @@ enum { }; struct tx_desc { - u64 flit[TX_DESC_FLITS]; + __be64 flit[TX_DESC_FLITS]; }; struct rx_desc { @@ -904,8 +904,8 @@ static void write_wr_hdr_sgl(unsigned int ndesc, struct sk_buff *skb, const struct sge_txq *q, const struct sg_ent *sgl, unsigned int flits, unsigned int sgl_flits, - unsigned int gen, unsigned int wr_hi, - unsigned int wr_lo) + unsigned int gen, __be32 wr_hi, + __be32 wr_lo) { struct work_request_hdr *wrp = (struct work_request_hdr *)d; struct tx_sw_desc *sd = &q->sdesc[pidx];