From 79cb5bee1b3983a9dab02327255592fdd0fc0657 Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Sun, 18 Nov 2012 13:16:14 +0200 Subject: [PATCH] --- yaml --- r: 341577 b: refs/heads/master c: 223b9cb1a04c056f364cfb979a8957800b5cc9f1 h: refs/heads/master i: 341575: 56c3c2adb629e7d1b72c364c0a0001a9d2321fe1 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/pcie/internal.h | 1 - trunk/drivers/net/wireless/iwlwifi/pcie/rx.c | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 509ee5ef609c..af5e1b52708a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49bd072d4ebab59217dadeb779a0a3dd2d0397ec +refs/heads/master: 223b9cb1a04c056f364cfb979a8957800b5cc9f1 diff --git a/trunk/drivers/net/wireless/iwlwifi/pcie/internal.h b/trunk/drivers/net/wireless/iwlwifi/pcie/internal.h index e6b6dba982c7..d91d2e8c62f5 100644 --- a/trunk/drivers/net/wireless/iwlwifi/pcie/internal.h +++ b/trunk/drivers/net/wireless/iwlwifi/pcie/internal.h @@ -329,7 +329,6 @@ void iwl_trans_pcie_free(struct iwl_trans *trans); ******************************************************/ int iwl_pcie_rx_init(struct iwl_trans *trans); void iwl_pcie_tasklet(struct iwl_trans *trans); -void iwl_pcie_rxq_inc_wr_ptr(struct iwl_trans *trans, struct iwl_rxq *q); int iwl_pcie_rx_stop(struct iwl_trans *trans); void iwl_pcie_rx_free(struct iwl_trans *trans); diff --git a/trunk/drivers/net/wireless/iwlwifi/pcie/rx.c b/trunk/drivers/net/wireless/iwlwifi/pcie/rx.c index 28a4968be1c1..c81b9782d2a4 100644 --- a/trunk/drivers/net/wireless/iwlwifi/pcie/rx.c +++ b/trunk/drivers/net/wireless/iwlwifi/pcie/rx.c @@ -142,9 +142,8 @@ int iwl_pcie_rx_stop(struct iwl_trans *trans) /* * iwl_pcie_rxq_inc_wr_ptr - Update the write pointer for the RX queue - * TODO - could be made static */ -void iwl_pcie_rxq_inc_wr_ptr(struct iwl_trans *trans, struct iwl_rxq *q) +static void iwl_pcie_rxq_inc_wr_ptr(struct iwl_trans *trans, struct iwl_rxq *q) { unsigned long flags; u32 reg;