tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

cxgb4/cxgb4vf: global named must be unique

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Stephen Rothwell and committed by
David S. Miller dd0bcc0b 22f10923

+6 -6
+1 -1
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
··· 1007 1007 int t4_prep_adapter(struct adapter *adapter); 1008 1008 1009 1009 enum t4_bar2_qtype { T4_BAR2_QTYPE_EGRESS, T4_BAR2_QTYPE_INGRESS }; 1010 - int t4_bar2_sge_qregs(struct adapter *adapter, 1010 + int cxgb4_t4_bar2_sge_qregs(struct adapter *adapter, 1011 1011 unsigned int qid, 1012 1012 enum t4_bar2_qtype qtype, 1013 1013 u64 *pbar2_qoffset,
+2 -2
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
··· 3815 3815 u64 *pbar2_qoffset, 3816 3816 unsigned int *pbar2_qid) 3817 3817 { 3818 - return t4_bar2_sge_qregs(netdev2adap(dev), 3818 + return cxgb4_t4_bar2_sge_qregs(netdev2adap(dev), 3819 3819 qid, 3820 3820 (qtype == CXGB4_BAR2_QTYPE_EGRESS 3821 3821 ? T4_BAR2_QTYPE_EGRESS ··· 4011 4011 unsigned int bar2_qid; 4012 4012 int ret; 4013 4013 4014 - ret = t4_bar2_sge_qregs(adap, qid, T4_BAR2_QTYPE_EGRESS, 4014 + ret = cxgb4_t4_bar2_sge_qregs(adap, qid, T4_BAR2_QTYPE_EGRESS, 4015 4015 &bar2_qoffset, &bar2_qid); 4016 4016 if (ret) 4017 4017 dev_err(adap->pdev_dev, "doorbell drop recovery: "
+1 -1
drivers/net/ethernet/chelsio/cxgb4/sge.c
··· 2270 2270 u64 bar2_qoffset; 2271 2271 int ret; 2272 2272 2273 - ret = t4_bar2_sge_qregs(adapter, qid, qtype, 2273 + ret = cxgb4_t4_bar2_sge_qregs(adapter, qid, qtype, 2274 2274 &bar2_qoffset, pbar2_qid); 2275 2275 if (ret) 2276 2276 return NULL;
+2 -2
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
··· 4031 4031 } 4032 4032 4033 4033 /** 4034 - * t4_bar2_sge_qregs - return BAR2 SGE Queue register information 4034 + * cxgb4_t4_bar2_sge_qregs - return BAR2 SGE Queue register information 4035 4035 * @adapter: the adapter 4036 4036 * @qid: the Queue ID 4037 4037 * @qtype: the Ingress or Egress type for @qid ··· 4055 4055 * Write Combining Doorbell Buffer. If the BAR2 Queue ID is not 0, 4056 4056 * then these "Inferred Queue ID" register may not be used. 4057 4057 */ 4058 - int t4_bar2_sge_qregs(struct adapter *adapter, 4058 + int cxgb4_t4_bar2_sge_qregs(struct adapter *adapter, 4059 4059 unsigned int qid, 4060 4060 enum t4_bar2_qtype qtype, 4061 4061 u64 *pbar2_qoffset,