diff options
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_common.h')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_common.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/ixgbe/ixgbe_common.h b/drivers/net/ixgbe/ixgbe_common.h index 66ed045a8cf0..508f635fc2ca 100644 --- a/drivers/net/ixgbe/ixgbe_common.h +++ b/drivers/net/ixgbe/ixgbe_common.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /******************************************************************************* | 1 | /******************************************************************************* |
2 | 2 | ||
3 | Intel 10 Gigabit PCI Express Linux driver | 3 | Intel 10 Gigabit PCI Express Linux driver |
4 | Copyright(c) 1999 - 2010 Intel Corporation. | 4 | Copyright(c) 1999 - 2011 Intel Corporation. |
5 | 5 | ||
6 | This program is free software; you can redistribute it and/or modify it | 6 | This program is free software; you can redistribute it and/or modify it |
7 | under the terms and conditions of the GNU General Public License, | 7 | under the terms and conditions of the GNU General Public License, |
@@ -29,6 +29,7 @@ | |||
29 | #define _IXGBE_COMMON_H_ | 29 | #define _IXGBE_COMMON_H_ |
30 | 30 | ||
31 | #include "ixgbe_type.h" | 31 | #include "ixgbe_type.h" |
32 | #include "ixgbe.h" | ||
32 | 33 | ||
33 | u32 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw); | 34 | u32 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw); |
34 | s32 ixgbe_init_ops_generic(struct ixgbe_hw *hw); | 35 | s32 ixgbe_init_ops_generic(struct ixgbe_hw *hw); |
@@ -62,8 +63,6 @@ s32 ixgbe_clear_rar_generic(struct ixgbe_hw *hw, u32 index); | |||
62 | s32 ixgbe_init_rx_addrs_generic(struct ixgbe_hw *hw); | 63 | s32 ixgbe_init_rx_addrs_generic(struct ixgbe_hw *hw); |
63 | s32 ixgbe_update_mc_addr_list_generic(struct ixgbe_hw *hw, | 64 | s32 ixgbe_update_mc_addr_list_generic(struct ixgbe_hw *hw, |
64 | struct net_device *netdev); | 65 | struct net_device *netdev); |
65 | s32 ixgbe_update_uc_addr_list_generic(struct ixgbe_hw *hw, | ||
66 | struct net_device *netdev); | ||
67 | s32 ixgbe_enable_mc_generic(struct ixgbe_hw *hw); | 66 | s32 ixgbe_enable_mc_generic(struct ixgbe_hw *hw); |
68 | s32 ixgbe_disable_mc_generic(struct ixgbe_hw *hw); | 67 | s32 ixgbe_disable_mc_generic(struct ixgbe_hw *hw); |
69 | s32 ixgbe_enable_rx_dma_generic(struct ixgbe_hw *hw, u32 regval); | 68 | s32 ixgbe_enable_rx_dma_generic(struct ixgbe_hw *hw, u32 regval); |
@@ -110,9 +109,8 @@ void ixgbe_set_vlan_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf); | |||
110 | 109 | ||
111 | #define IXGBE_WRITE_FLUSH(a) IXGBE_READ_REG(a, IXGBE_STATUS) | 110 | #define IXGBE_WRITE_FLUSH(a) IXGBE_READ_REG(a, IXGBE_STATUS) |
112 | 111 | ||
113 | extern struct net_device *ixgbe_get_hw_dev(struct ixgbe_hw *hw); | ||
114 | #define hw_dbg(hw, format, arg...) \ | 112 | #define hw_dbg(hw, format, arg...) \ |
115 | netdev_dbg(ixgbe_get_hw_dev(hw), format, ##arg) | 113 | netdev_dbg(((struct ixgbe_adapter *)(hw->back))->netdev, format, ##arg) |
116 | #define e_dev_info(format, arg...) \ | 114 | #define e_dev_info(format, arg...) \ |
117 | dev_info(&adapter->pdev->dev, format, ## arg) | 115 | dev_info(&adapter->pdev->dev, format, ## arg) |
118 | #define e_dev_warn(format, arg...) \ | 116 | #define e_dev_warn(format, arg...) \ |