Pull networking fixes from Jakub Kicinski: "Networking fixes including fixes from can, xfrm, wireless, wireless-drivers and netfilter trees. Nothing scary, Intel WiFi-related fixes seemed most notable to the users. Current release - regressions: - dsa: microchip: ksz8795: fix KSZ8794 port map again to program the CPU port correctly Current release - new code bugs: - iwlwifi: pcie: reschedule in long-running memory reads Previous releases - regressions: - iwlwifi: dbg: don't try to overwrite read-only FW data - iwlwifi: provide gso_type to GSO packets - octeontx2: make sure the buffer is 128 byte aligned - tcp: make TCP_USER_TIMEOUT accurate for zero window probes - xfrm: fix wraparound in xfrm_policy_addr_delta() - xfrm: fix oops in xfrm_replay_advance_bmp due to a race between CPUs in presence of packet reorder - tcp: fix TLP timer not set when CA_STATE changes from DISORDER to OPEN - wext: fix NULL-ptr-dereference with cfg80211's lack of commit() Previous releases - always broken: - igc: fix link speed advertising - stmmac: configure EHL PSE0 GbE and PSE1 GbE to 32 bits DMA addressing - team: protect features update by RCU to avoid deadlock - xfrm: fix disable_xfrm sysctl when used on xfrm interfaces themselves - fec: fix temporary RMII clock reset on link up - can: dev: prevent potential information leak in can_fill_info() Misc: - mrp: fix bad packing of MRP test packet structures - uapi: fix big endian definition of ipv6_rpl_sr_hdr - add David Ahern to IPv4/IPv6 maintainers" * tag 'net-5.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (86 commits) rxrpc: Fix memory leak in rxrpc_lookup_local mlxsw: spectrum_span: Do not overwrite policer configuration selftests: forwarding: Specify interface when invoking mausezahn stmmac: intel: Configure EHL PSE0 GbE and PSE1 GbE to 32 bits DMA addressing net: usb: cdc_ether: added support for Thales Cinterion PLSx3 modem family. ibmvnic: Ensure that CRQ entry read are correctly ordered MAINTAINERS: add missing header for bonding net: decnet: fix netdev refcount leaking on error path net: switchdev: don't set port_obj_info->handled true when -EOPNOTSUPP can: dev: prevent potential information leak in can_fill_info() net: fec: Fix temporary RMII clock reset on link up net: lapb: Add locking to the lapb module team: protect features update by RCU to avoid deadlock MAINTAINERS: add David Ahern to IPv4/IPv6 maintainers net/mlx5: CT: Fix incorrect removal of tuple_nat_node from nat rhashtable net/mlx5e: Revert parameters on errors when changing MTU and LRO state without reset net/mlx5e: Revert parameters on errors when changing trust state without reset net/mlx5e: Correctly handle changing the number of queues when the interface is down net/mlx5e: Fix CT rule + encap slow path offload and deletion net/mlx5e: Disable hw-tc-offload when MLX5_CLS_ACT config is disabled ...
Showing the changes to include/uapi/linux (2 of 93 files). Show all
Unified · Split
| @@ -71,90 +71,4 @@ enum br_mrp_sub_tlv_header_type { · 70 unmodified lines | |||
| 71 | BR_MRP_SUB_TLV_HEADER_TEST_AUTO_MGR = 0x3, | 71 | BR_MRP_SUB_TLV_HEADER_TEST_AUTO_MGR = 0x3, |
| 72 | }; | 72 | }; |
| 73 | 73 | ||
| 74 | struct br_mrp_tlv_hdr { | ||
| 75 | __u8 type; | ||
| 76 | __u8 length; | ||
| 77 | }; | ||
| 78 | |||
| 79 | struct br_mrp_sub_tlv_hdr { | ||
| 80 | __u8 type; | ||
| 81 | __u8 length; | ||
| 82 | }; | ||
| 83 | |||
| 84 | struct br_mrp_end_hdr { | ||
| 85 | struct br_mrp_tlv_hdr hdr; | ||
| 86 | }; | ||
| 87 | |||
| 88 | struct br_mrp_common_hdr { | ||
| 89 | __be16 seq_id; | ||
| 90 | __u8 domain[MRP_DOMAIN_UUID_LENGTH]; | ||
| 91 | }; | ||
| 92 | |||
| 93 | struct br_mrp_ring_test_hdr { | ||
| 94 | __be16 prio; | ||
| 95 | __u8 sa[ETH_ALEN]; | ||
| 96 | __be16 port_role; | ||
| 97 | __be16 state; | ||
| 98 | __be16 transitions; | ||
| 99 | __be32 timestamp; | ||
| 100 | }; | ||
| 101 | |||
| 102 | struct br_mrp_ring_topo_hdr { | ||
| 103 | __be16 prio; | ||
| 104 | __u8 sa[ETH_ALEN]; | ||
| 105 | __be16 interval; | ||
| 106 | }; | ||
| 107 | |||
| 108 | struct br_mrp_ring_link_hdr { | ||
| 109 | __u8 sa[ETH_ALEN]; | ||
| 110 | __be16 port_role; | ||
| 111 | __be16 interval; | ||
| 112 | __be16 blocked; | ||
| 113 | }; | ||
| 114 | |||
| 115 | struct br_mrp_sub_opt_hdr { | ||
| 116 | __u8 type; | ||
| 117 | __u8 manufacture_data[MRP_MANUFACTURE_DATA_LENGTH]; | ||
| 118 | }; | ||
| 119 | |||
| 120 | struct br_mrp_test_mgr_nack_hdr { | ||
| 121 | __be16 prio; | ||
| 122 | __u8 sa[ETH_ALEN]; | ||
| 123 | __be16 other_prio; | ||
| 124 | __u8 other_sa[ETH_ALEN]; | ||
| 125 | }; | ||
| 126 | |||
| 127 | struct br_mrp_test_prop_hdr { | ||
| 128 | __be16 prio; | ||
| 129 | __u8 sa[ETH_ALEN]; | ||
| 130 | __be16 other_prio; | ||
| 131 | __u8 other_sa[ETH_ALEN]; | ||
| 132 | }; | ||
| 133 | |||
| 134 | struct br_mrp_oui_hdr { | ||
| 135 | __u8 oui[MRP_OUI_LENGTH]; | ||
| 136 | }; | ||
| 137 | |||
| 138 | struct br_mrp_in_test_hdr { | ||
| 139 | __be16 id; | ||
| 140 | __u8 sa[ETH_ALEN]; | ||
| 141 | __be16 port_role; | ||
| 142 | __be16 state; | ||
| 143 | __be16 transitions; | ||
| 144 | __be32 timestamp; | ||
| 145 | }; | ||
| 146 | |||
| 147 | struct br_mrp_in_topo_hdr { | ||
| 148 | __u8 sa[ETH_ALEN]; | ||
| 149 | __be16 id; | ||
| 150 | __be16 interval; | ||
| 151 | }; | ||
| 152 | |||
| 153 | struct br_mrp_in_link_hdr { | ||
| 154 | __u8 sa[ETH_ALEN]; | ||
| 155 | __be16 port_role; | ||
| 156 | __be16 id; | ||
| 157 | __be16 interval; | ||
| 158 | }; | ||
| 159 | |||
| 160 | #endif | 74 | #endif |
| @@ -28,10 +28,10 @@ struct ipv6_rpl_sr_hdr { · 27 unmodified lines | |||
| 28 | pad:4, | 28 | pad:4, |
| 29 | reserved1:16; | 29 | reserved1:16; |
| 30 | #elif defined(__BIG_ENDIAN_BITFIELD) | 30 | #elif defined(__BIG_ENDIAN_BITFIELD) |
| 31 | __u32 reserved:20, | 31 | __u32 cmpri:4, |
| 32 | cmpre:4, | ||
| 32 | pad:4, | 33 | pad:4, |
| 33 | cmpri:4, | 34 | reserved:20; |
| 34 | cmpre:4; | ||
| 35 | #else | 35 | #else |
| 36 | #error "Please fix <asm/byteorder.h>" | 36 | #error "Please fix <asm/byteorder.h>" |
| 37 | #endif | 37 | #endif |