History

Merge tag 'net-5.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Pull networking fixes from Jakub Kicinski: "Including fixes from bluetooth, and ipsec. Current release - regressions: - Bluetooth: fix unbalanced unlock in set_device_flags() - Bluetooth: fix not processing all entries on cmd_sync_work, make connect with qualcomm and intel adapters reliable - Revert "xfrm: state and policy should fail if XFRMA_IF_ID 0" - xdp: xdp_mem_allocator can be NULL in trace_mem_connect() - eth: ice: fix race condition and deadlock during interface enslave Current release - new code bugs: - tipc: fix incorrect order of state message data sanity check Previous releases - regressions: - esp: fix possible buffer overflow in ESP transformation - dsa: unlock the rtnl_mutex when dsa_master_setup() fails - phy: meson-gxl: fix interrupt handling in forced mode - smsc95xx: ignore -ENODEV errors when device is unplugged Previous releases - always broken: - xfrm: fix tunnel mode fragmentation behavior - esp: fix inter address family tunneling on GSO - tipc: fix null-deref due to race when enabling bearer - sctp: fix kernel-infoleak for SCTP sockets - eth: macb: fix lost RX packet wakeup race in NAPI receive - eth: intel stop disabling VFs due to PF error responses - eth: bcmgenet: don't claim WOL when its not available" * tag 'net-5.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (50 commits) xdp: xdp_mem_allocator can be NULL in trace_mem_connect(). ice: Fix race condition during interface enslave net: phy: meson-gxl: improve link-up behavior net: bcmgenet: Don't claim WOL when its not available net: arc_emac: Fix use after free in arc_mdio_probe() sctp: fix kernel-infoleak for SCTP sockets net: phy: correct spelling error of media in documentation net: phy: DP83822: clear MISR2 register to disable interrupts gianfar: ethtool: Fix refcount leak in gfar_get_ts_info selftests: pmtu.sh: Kill nettest processes launched in subshell. selftests: pmtu.sh: Kill tcpdump processes launched by subshell. NFC: port100: fix use-after-free in port100_send_complete net/mlx5e: SHAMPO, reduce TIR indication net/mlx5e: Lag, Only handle events from highest priority multipath entry net/mlx5: Fix offloading with ESWITCH_IPV4_TTL_MODIFY_ENABLE net/mlx5: Fix a race on command flush flow net/mlx5: Fix size field in bufferx_reg struct ax25: Fix NULL pointer dereference in ax25_kill_by_device net: marvell: prestera: Add missing of_node_put() in prestera_switch_set_base_mac_addr net: ethernet: lpc_eth: Handle error for clk_enable ...

Linus Torvalds committed 4 years ago

Commit 186d32b2 parents 3bcb645 e0ae71357 files · +383 −244Browse files

Showing the changes to include/linux (3 of 57 files). Show all

Unified · Split

3 files
  1. include/linux/mlx5/mlx5_ifc.h +2 −3
  2. include/linux/netdevice.h +2 −0
  3. include/linux/phy.h +2 −2
include/linux/mlx5/mlx5_ifc.h+2−3
@@ -3434,7 +3434,6 @@ enum { · 3433 unmodified lines
3434enum {3434enum {
3435 MLX5_TIRC_PACKET_MERGE_MASK_IPV4_LRO = BIT(0),3435 MLX5_TIRC_PACKET_MERGE_MASK_IPV4_LRO = BIT(0),
3436 MLX5_TIRC_PACKET_MERGE_MASK_IPV6_LRO = BIT(1),3436 MLX5_TIRC_PACKET_MERGE_MASK_IPV6_LRO = BIT(1),
3437 MLX5_TIRC_PACKET_MERGE_MASK_SHAMPO = BIT(2),
3438};3437};
3439 3438
3440enum {3439enum {
@@ -9900,8 +9899,8 @@ struct mlx5_ifc_bufferx_reg_bits { · 6459 unmodified lines
9900 u8 reserved_at_0[0x6];9899 u8 reserved_at_0[0x6];
9901 u8 lossy[0x1];9900 u8 lossy[0x1];
9902 u8 epsb[0x1];9901 u8 epsb[0x1];
9903 u8 reserved_at_8[0xc];9902 u8 reserved_at_8[0x8];
9904 u8 size[0xc];9903 u8 size[0x10];
9905 9904
9906 u8 xoff_threshold[0x10];9905 u8 xoff_threshold[0x10];
9907 u8 xon_threshold[0x10];9906 u8 xon_threshold[0x10];
include/linux/netdevice.h+2−0
@@ -4602,6 +4602,8 @@ int skb_csum_hwoffload_help(struct sk_buff *skb, · 4601 unmodified lines
4602 4602
4603struct sk_buff *__skb_gso_segment(struct sk_buff *skb,4603struct sk_buff *__skb_gso_segment(struct sk_buff *skb,
4604 netdev_features_t features, bool tx_path);4604 netdev_features_t features, bool tx_path);
4605struct sk_buff *skb_eth_gso_segment(struct sk_buff *skb,
4606 netdev_features_t features, __be16 type);
4605struct sk_buff *skb_mac_gso_segment(struct sk_buff *skb,4607struct sk_buff *skb_mac_gso_segment(struct sk_buff *skb,
4606 netdev_features_t features);4608 netdev_features_t features);
4607 4609
include/linux/phy.h+2−2
@@ -87,8 +87,8 @@ extern const int phy_10gbit_features_array[1]; · 86 unmodified lines
87 *87 *
88 * @PHY_INTERFACE_MODE_NA: Not Applicable - don't touch88 * @PHY_INTERFACE_MODE_NA: Not Applicable - don't touch
89 * @PHY_INTERFACE_MODE_INTERNAL: No interface, MAC and PHY combined89 * @PHY_INTERFACE_MODE_INTERNAL: No interface, MAC and PHY combined
90 * @PHY_INTERFACE_MODE_MII: Median-independent interface90 * @PHY_INTERFACE_MODE_MII: Media-independent interface
91 * @PHY_INTERFACE_MODE_GMII: Gigabit median-independent interface91 * @PHY_INTERFACE_MODE_GMII: Gigabit media-independent interface
92 * @PHY_INTERFACE_MODE_SGMII: Serial gigabit media-independent interface92 * @PHY_INTERFACE_MODE_SGMII: Serial gigabit media-independent interface
93 * @PHY_INTERFACE_MODE_TBI: Ten Bit Interface93 * @PHY_INTERFACE_MODE_TBI: Ten Bit Interface
94 * @PHY_INTERFACE_MODE_REVMII: Reverse Media Independent Interface94 * @PHY_INTERFACE_MODE_REVMII: Reverse Media Independent Interface