Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[karo-tx-linux.git] / drivers / net / ethernet / chelsio / cxgb4 / t4_hw.c

diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index 9d93f4c273002d840a973e2b337c2d1ec6596741..2b52aae7ec86d38b9e658e6e92d1f82ae3c6c879 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -6102,6 +6102,7 @@ int t4_prep_adapter(struct adapter *adapter)
  *     @adapter: the adapter
  *     @qid: the Queue ID
  *     @qtype: the Ingress or Egress type for @qid
+ *     @user: true if this request is for a user mode queue
  *     @pbar2_qoffset: BAR2 Queue Offset
  *     @pbar2_qid: BAR2 Queue ID or 0 for Queue ID inferred SGE Queues
  *
@@ -6125,6 +6126,7 @@ int t4_prep_adapter(struct adapter *adapter)
 int t4_bar2_sge_qregs(struct adapter *adapter,
                      unsigned int qid,
                      enum t4_bar2_qtype qtype,
+                     int user,
                      u64 *pbar2_qoffset,
                      unsigned int *pbar2_qid)
 {
@@ -6132,9 +6134,8 @@ int t4_bar2_sge_qregs(struct adapter *adapter,
        u64 bar2_page_offset, bar2_qoffset;
        unsigned int bar2_qid, bar2_qid_offset, bar2_qinferred;
 
-       /* T4 doesn't support BAR2 SGE Queue registers.
-        */
-       if (is_t4(adapter->params.chip))
+       /* T4 doesn't support BAR2 SGE Queue registers for kernel mode queues */
+       if (!user && is_t4(adapter->params.chip))
                return -EINVAL;
 
        /* Get our SGE Page Size parameters.