summaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe/ixgbe.h
diff options
context:
space:
mode:
authorAyyappan Veeraiyan2008-02-02 00:58:41 +0100
committerJeff Garzik2008-02-05 19:31:31 +0100
commitd4f80882ee7bdc721230b9ac209ddd3a837e4545 (patch)
treeec7a096ac3c39c0d5cc5f32e88f8c7bf2f089e4c /drivers/net/ixgbe/ixgbe.h
parentxircom_cb should return NETDEV_TX_BUSY when no descriptors available (diff)
downloadkernel-qcow2-linux-d4f80882ee7bdc721230b9ac209ddd3a837e4545.tar.gz
kernel-qcow2-linux-d4f80882ee7bdc721230b9ac209ddd3a837e4545.tar.xz
kernel-qcow2-linux-d4f80882ee7bdc721230b9ac209ddd3a837e4545.zip
ixgbe: remove obsolete irq_sem, add driver state checking code
After testing we confirmed that the irq_sem can safely be removed from ixgbe. Add strict state checking code to various ethtool parts to properly protect against races between various driver reset paths. Signed-off-by: Ayyappan Veeraiyan <ayyappan.veeraiyan@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe.h')
-rw-r--r--drivers/net/ixgbe/ixgbe.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h
index a021a6e72641..7dd9a03650d3 100644
--- a/drivers/net/ixgbe/ixgbe.h
+++ b/drivers/net/ixgbe/ixgbe.h
@@ -174,7 +174,6 @@ struct ixgbe_adapter {
struct vlan_group *vlgrp;
u16 bd_number;
u16 rx_buf_len;
- atomic_t irq_sem;
struct work_struct reset_task;
/* TX */
@@ -244,6 +243,7 @@ extern const char ixgbe_driver_version[];
extern int ixgbe_up(struct ixgbe_adapter *adapter);
extern void ixgbe_down(struct ixgbe_adapter *adapter);
+extern void ixgbe_reinit_locked(struct ixgbe_adapter *adapter);
extern void ixgbe_reset(struct ixgbe_adapter *adapter);
extern void ixgbe_update_stats(struct ixgbe_adapter *adapter);
extern void ixgbe_set_ethtool_ops(struct net_device *netdev);