diff options
Diffstat (limited to 'drivers/net/ethernet/intel/igb/igb.h')
-rw-r--r-- | drivers/net/ethernet/intel/igb/igb.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h index ccf472f073dd..411b213c63be 100644 --- a/drivers/net/ethernet/intel/igb/igb.h +++ b/drivers/net/ethernet/intel/igb/igb.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /******************************************************************************* | 1 | /******************************************************************************* |
2 | 2 | ||
3 | Intel(R) Gigabit Ethernet Linux driver | 3 | Intel(R) Gigabit Ethernet Linux driver |
4 | Copyright(c) 2007-2013 Intel Corporation. | 4 | Copyright(c) 2007-2014 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, |
@@ -13,8 +13,7 @@ | |||
13 | more details. | 13 | more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License along with | 15 | You should have received a copy of the GNU General Public License along with |
16 | this program; if not, write to the Free Software Foundation, Inc., | 16 | this program; if not, see <http://www.gnu.org/licenses/>. |
17 | 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. | ||
18 | 17 | ||
19 | The full GNU General Public License is included in this distribution in | 18 | The full GNU General Public License is included in this distribution in |
20 | the file called "COPYING". | 19 | the file called "COPYING". |
@@ -42,6 +41,7 @@ | |||
42 | #include <linux/i2c.h> | 41 | #include <linux/i2c.h> |
43 | #include <linux/i2c-algo-bit.h> | 42 | #include <linux/i2c-algo-bit.h> |
44 | #include <linux/pci.h> | 43 | #include <linux/pci.h> |
44 | #include <linux/mdio.h> | ||
45 | 45 | ||
46 | struct igb_adapter; | 46 | struct igb_adapter; |
47 | 47 | ||
@@ -434,6 +434,7 @@ struct igb_adapter { | |||
434 | struct delayed_work ptp_overflow_work; | 434 | struct delayed_work ptp_overflow_work; |
435 | struct work_struct ptp_tx_work; | 435 | struct work_struct ptp_tx_work; |
436 | struct sk_buff *ptp_tx_skb; | 436 | struct sk_buff *ptp_tx_skb; |
437 | struct hwtstamp_config tstamp_config; | ||
437 | unsigned long ptp_tx_start; | 438 | unsigned long ptp_tx_start; |
438 | unsigned long last_rx_ptp_check; | 439 | unsigned long last_rx_ptp_check; |
439 | spinlock_t tmreg_lock; | 440 | spinlock_t tmreg_lock; |
@@ -456,6 +457,7 @@ struct igb_adapter { | |||
456 | unsigned long link_check_timeout; | 457 | unsigned long link_check_timeout; |
457 | int copper_tries; | 458 | int copper_tries; |
458 | struct e1000_info ei; | 459 | struct e1000_info ei; |
460 | u16 eee_advert; | ||
459 | }; | 461 | }; |
460 | 462 | ||
461 | #define IGB_FLAG_HAS_MSI (1 << 0) | 463 | #define IGB_FLAG_HAS_MSI (1 << 0) |
@@ -472,6 +474,7 @@ struct igb_adapter { | |||
472 | #define IGB_FLAG_MAS_CAPABLE (1 << 11) | 474 | #define IGB_FLAG_MAS_CAPABLE (1 << 11) |
473 | #define IGB_FLAG_MAS_ENABLE (1 << 12) | 475 | #define IGB_FLAG_MAS_ENABLE (1 << 12) |
474 | #define IGB_FLAG_HAS_MSIX (1 << 13) | 476 | #define IGB_FLAG_HAS_MSIX (1 << 13) |
477 | #define IGB_FLAG_EEE (1 << 14) | ||
475 | 478 | ||
476 | /* Media Auto Sense */ | 479 | /* Media Auto Sense */ |
477 | #define IGB_MAS_ENABLE_0 0X0001 | 480 | #define IGB_MAS_ENABLE_0 0X0001 |
@@ -525,9 +528,7 @@ void igb_set_fw_version(struct igb_adapter *); | |||
525 | void igb_ptp_init(struct igb_adapter *adapter); | 528 | void igb_ptp_init(struct igb_adapter *adapter); |
526 | void igb_ptp_stop(struct igb_adapter *adapter); | 529 | void igb_ptp_stop(struct igb_adapter *adapter); |
527 | void igb_ptp_reset(struct igb_adapter *adapter); | 530 | void igb_ptp_reset(struct igb_adapter *adapter); |
528 | void igb_ptp_tx_work(struct work_struct *work); | ||
529 | void igb_ptp_rx_hang(struct igb_adapter *adapter); | 531 | void igb_ptp_rx_hang(struct igb_adapter *adapter); |
530 | void igb_ptp_tx_hwtstamp(struct igb_adapter *adapter); | ||
531 | void igb_ptp_rx_rgtstamp(struct igb_q_vector *q_vector, struct sk_buff *skb); | 532 | void igb_ptp_rx_rgtstamp(struct igb_q_vector *q_vector, struct sk_buff *skb); |
532 | void igb_ptp_rx_pktstamp(struct igb_q_vector *q_vector, unsigned char *va, | 533 | void igb_ptp_rx_pktstamp(struct igb_q_vector *q_vector, unsigned char *va, |
533 | struct sk_buff *skb); | 534 | struct sk_buff *skb); |
@@ -545,8 +546,8 @@ static inline void igb_ptp_rx_hwtstamp(struct igb_ring *rx_ring, | |||
545 | rx_ring->last_rx_timestamp = jiffies; | 546 | rx_ring->last_rx_timestamp = jiffies; |
546 | } | 547 | } |
547 | 548 | ||
548 | int igb_ptp_hwtstamp_ioctl(struct net_device *netdev, struct ifreq *ifr, | 549 | int igb_ptp_set_ts_config(struct net_device *netdev, struct ifreq *ifr); |
549 | int cmd); | 550 | int igb_ptp_get_ts_config(struct net_device *netdev, struct ifreq *ifr); |
550 | #ifdef CONFIG_IGB_HWMON | 551 | #ifdef CONFIG_IGB_HWMON |
551 | void igb_sysfs_exit(struct igb_adapter *adapter); | 552 | void igb_sysfs_exit(struct igb_adapter *adapter); |
552 | int igb_sysfs_init(struct igb_adapter *adapter); | 553 | int igb_sysfs_init(struct igb_adapter *adapter); |