Pull networking fixes from David Miller: 1) Fix NAPI poll list corruption in enic driver, from Christian Lamparter. 2) Fix route use after free, from Eric Dumazet. 3) Fix regression in reuseaddr handling, from Josef Bacik. 4) Assert the size of control messages in compat handling since we copy it in from userspace twice. From Meng Xu. 5) SMC layer bug fixes (missing RCU locking, bad refcounting, etc.) from Ursula Braun. 6) Fix races in AF_PACKET fanout handling, from Willem de Bruijn. 7) Don't use ARRAY_SIZE on spinlock array which might have zero entries, from Geert Uytterhoeven. 8) Fix miscomputation of checksum in ipv6 udp code, from Subash Abhinov Kasiviswanathan. 9) Push the ipv6 header properly in ipv6 GRE tunnel driver, from Xin Long. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (75 commits) inet: fix improper empty comparison net: use inet6_rcv_saddr to compare sockets net: set tb->fast_sk_family net: orphan frags on stand-alone ptype in dev_queue_xmit_nit MAINTAINERS: update git tree locations for ieee802154 subsystem net: prevent dst uses after free net: phy: Fix truncation of large IRQ numbers in phy_attached_print() net/smc: no close wait in case of process shut down net/smc: introduce a delay net/smc: terminate link group if out-of-sync is received net/smc: longer delay for client link group removal net/smc: adapt send request completion notification net/smc: adjust net_device refcount net/smc: take RCU read lock for routing cache lookup net/smc: add receive timeout check net/smc: add missing dev_put net: stmmac: Cocci spatch "of_table" lan78xx: Use default values loaded from EEPROM/OTP after reset lan78xx: Allow EEPROM write for less than MAX_EEPROM_SIZE lan78xx: Fix for eeprom read/write when device auto suspend ...
Showing the changes to include/uapi/linux (1 of 71 files). Show all
Unified · Split
| @@ -1753,6 +1753,8 @@ enum ethtool_reset_flags { · 1752 unmodified lines | |||
| 1753 | * %ethtool_link_mode_bit_indices for the link modes, and other | 1753 | * %ethtool_link_mode_bit_indices for the link modes, and other |
| 1754 | * link features that the link partner advertised through | 1754 | * link features that the link partner advertised through |
| 1755 | * autonegotiation; 0 if unknown or not applicable. Read-only. | 1755 | * autonegotiation; 0 if unknown or not applicable. Read-only. |
| 1756 | * @transceiver: Used to distinguish different possible PHY types, | ||
| 1757 | * reported consistently by PHYLIB. Read-only. | ||
| 1756 | * | 1758 | * |
| 1757 | * If autonegotiation is disabled, the speed and @duplex represent the | 1759 | * If autonegotiation is disabled, the speed and @duplex represent the |
| 1758 | * fixed link mode and are writable if the driver supports multiple | 1760 | * fixed link mode and are writable if the driver supports multiple |
| @@ -1804,7 +1806,9 @@ struct ethtool_link_settings { · 45 unmodified lines | |||
| 1804 | __u8 eth_tp_mdix; | 1806 | __u8 eth_tp_mdix; |
| 1805 | __u8 eth_tp_mdix_ctrl; | 1807 | __u8 eth_tp_mdix_ctrl; |
| 1806 | __s8 link_mode_masks_nwords; | 1808 | __s8 link_mode_masks_nwords; |
| 1807 | __u32 reserved[8]; | 1809 | __u8 transceiver; |
| 1810 | __u8 reserved1[3]; | ||
| 1811 | __u32 reserved[7]; | ||
| 1808 | __u32 link_mode_masks[0]; | 1812 | __u32 link_mode_masks[0]; |
| 1809 | /* layout of link_mode_masks fields: | 1813 | /* layout of link_mode_masks fields: |
| 1810 | * __u32 map_supported[link_mode_masks_nwords]; | 1814 | * __u32 map_supported[link_mode_masks_nwords]; |