* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits) forcedeth: fix a few sparse warnings (variable shadowing) forcedeth: Improve stats counters forcedeth: remove unneeded stats updates forcedeth: Acknowledge only interrupts that are being processed forcedeth: fix race when unloading module MAINTAINERS/rds: update maintainer wanrouter: Remove kernel_lock annotations usbnet: fix oops in usbnet_start_xmit ixgbe: Fix compile for kernel without CONFIG_PCI_IOV defined etherh: Add MAINTAINERS entry for etherh bonding: comparing a u8 with -1 is always false sky2: fix regression on Yukon Optima netlink: clarify attribute length check documentation netlink: validate NLA_MSECS length i825xx:xscale:8390:freescale: Fix Kconfig dependancies macvlan: receive multicast with local address tg3: Update version to 3.121 tg3: Eliminate timer race with reset_task tg3: Schedule at most one tg3_reset_task run tg3: Obtain PCI function number from device ...
Showing the changes to include/linux (1 of 43 files). Show all
Unified · Split
| @@ -1097,10 +1097,12 @@ struct ethtool_ops { · 1096 unmodified lines | |||
| 1097 | #define SPEED_1000 1000 | 1097 | #define SPEED_1000 1000 |
| 1098 | #define SPEED_2500 2500 | 1098 | #define SPEED_2500 2500 |
| 1099 | #define SPEED_10000 10000 | 1099 | #define SPEED_10000 10000 |
| 1100 | #define SPEED_UNKNOWN -1 | ||
| 1100 | 1101 | ||
| 1101 | /* Duplex, half or full. */ | 1102 | /* Duplex, half or full. */ |
| 1102 | #define DUPLEX_HALF 0x00 | 1103 | #define DUPLEX_HALF 0x00 |
| 1103 | #define DUPLEX_FULL 0x01 | 1104 | #define DUPLEX_FULL 0x01 |
| 1105 | #define DUPLEX_UNKNOWN 0xff | ||
| 1104 | 1106 | ||
| 1105 | /* Which connector port. */ | 1107 | /* Which connector port. */ |
| 1106 | #define PORT_TP 0x00 | 1108 | #define PORT_TP 0x00 |