aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2017-10-14 17:04:40 +0300
committerDavid S. Miller <davem@davemloft.net>2017-10-16 21:12:32 +0100
commit2a600d97cbb2a9311e6b42547d37e0eca9b9d6d6 (patch)
tree8a03f91206a0aac5a7a7f415b41d5f6490745d43 /drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h
parenttracing: bpf: Hide bpf trace events when they are not used (diff)
downloadlinux-dev-2a600d97cbb2a9311e6b42547d37e0eca9b9d6d6.tar.xz
linux-dev-2a600d97cbb2a9311e6b42547d37e0eca9b9d6d6.zip
pch_gbe: Switch to new PCI IRQ allocation API
This removes custom flag handling. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h')
-rw-r--r--drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h
index 8d710a3b4db0..697e29dd4bd3 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h
@@ -613,7 +613,6 @@ struct pch_gbe_privdata {
* @rx_ring: Pointer of Rx descriptor ring structure
* @rx_buffer_len: Receive buffer length
* @tx_queue_len: Transmit queue length
- * @have_msi: PCI MSI mode flag
* @pch_gbe_privdata: PCI Device ID driver_data
*/
@@ -623,6 +622,7 @@ struct pch_gbe_adapter {
atomic_t irq_sem;
struct net_device *netdev;
struct pci_dev *pdev;
+ int irq;
struct net_device *polling_netdev;
struct napi_struct napi;
struct pch_gbe_hw hw;
@@ -637,7 +637,6 @@ struct pch_gbe_adapter {
struct pch_gbe_rx_ring *rx_ring;
unsigned long rx_buffer_len;
unsigned long tx_queue_len;
- bool have_msi;
bool rx_stop_flag;
int hwts_tx_en;
int hwts_rx_en;