diff --git a/[refs] b/[refs] index 80c98617f20c..cf4cde422f5c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a362db3d6c8a952cbde510b1fa35d0ee001b347e +refs/heads/master: debd0034de1f68585ab5d1d3d693d38f19d48e5d diff --git a/trunk/drivers/net/ethernet/sfc/efx.c b/trunk/drivers/net/ethernet/sfc/efx.c index 78c33249a21b..01b99206139a 100644 --- a/trunk/drivers/net/ethernet/sfc/efx.c +++ b/trunk/drivers/net/ethernet/sfc/efx.c @@ -2950,8 +2950,8 @@ static const struct dev_pm_ops efx_pm_ops = { * At this point MMIO and DMA may be disabled. * Stop the software path and request a slot reset. */ -pci_ers_result_t efx_io_error_detected(struct pci_dev *pdev, - enum pci_channel_state state) +static pci_ers_result_t efx_io_error_detected(struct pci_dev *pdev, + enum pci_channel_state state) { pci_ers_result_t status = PCI_ERS_RESULT_RECOVERED; struct efx_nic *efx = pci_get_drvdata(pdev); @@ -2986,7 +2986,7 @@ pci_ers_result_t efx_io_error_detected(struct pci_dev *pdev, } /* Fake a successfull reset, which will be performed later in efx_io_resume. */ -pci_ers_result_t efx_io_slot_reset(struct pci_dev *pdev) +static pci_ers_result_t efx_io_slot_reset(struct pci_dev *pdev) { struct efx_nic *efx = pci_get_drvdata(pdev); pci_ers_result_t status = PCI_ERS_RESULT_RECOVERED; diff --git a/trunk/drivers/net/ethernet/sfc/rx.c b/trunk/drivers/net/ethernet/sfc/rx.c index a948b36c1910..e73e30bac10e 100644 --- a/trunk/drivers/net/ethernet/sfc/rx.c +++ b/trunk/drivers/net/ethernet/sfc/rx.c @@ -666,8 +666,8 @@ int efx_probe_rx_queue(struct efx_rx_queue *rx_queue) return rc; } -void efx_init_rx_recycle_ring(struct efx_nic *efx, - struct efx_rx_queue *rx_queue) +static void efx_init_rx_recycle_ring(struct efx_nic *efx, + struct efx_rx_queue *rx_queue) { unsigned int bufs_in_recycle_ring, page_ring_size;