History

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

Pull networking fixes from Paolo Abeni: "Including fixes from netfilter and bpf. There are a few fixes for new code bugs, including the Mellanox one noted in the last networking pull. No known regressions outstanding. Current release - regressions: - sched: clear actions pointer in miss cookie init fail - mptcp: fix accept vs worker race - bpf: fix bpf_arch_text_poke() with new_addr == NULL on s390 - eth: bnxt_en: fix a possible NULL pointer dereference in unload path - eth: veth: take into account peer device for NETDEV_XDP_ACT_NDO_XMIT xdp_features flag Current release - new code bugs: - eth: revert "net/mlx5: Enable management PF initialization" Previous releases - regressions: - netfilter: fix recent physdev match breakage - bpf: fix incorrect verifier pruning due to missing register precision taints - eth: virtio_net: fix overflow inside xdp_linearize_page() - eth: cxgb4: fix use after free bugs caused by circular dependency problem - eth: mlxsw: pci: fix possible crash during initialization Previous releases - always broken: - sched: sch_qfq: prevent slab-out-of-bounds in qfq_activate_agg - netfilter: validate catch-all set elements - bridge: don't notify FDB entries with "master dynamic" - eth: bonding: fix memory leak when changing bond type to ethernet - eth: i40e: fix accessing vsi->active_filters without holding lock Misc: - Mat is back as MPTCP co-maintainer" * tag 'net-6.3-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (33 commits) net: bridge: switchdev: don't notify FDB entries with "master dynamic" Revert "net/mlx5: Enable management PF initialization" MAINTAINERS: Resume MPTCP co-maintainer role mailmap: add entries for Mat Martineau e1000e: Disable TSO on i219-LM card to increase speed bnxt_en: fix free-runnig PHC mode net: dsa: microchip: ksz8795: Correctly handle huge frame configuration bpf: Fix incorrect verifier pruning due to missing register precision taints hamradio: drop ISA_DMA_API dependency mlxsw: pci: Fix possible crash during initialization mptcp: fix accept vs worker race mptcp: stops worker on unaccepted sockets at listener close net: rpl: fix rpl header size calculation net: vmxnet3: Fix NULL pointer dereference in vmxnet3_rq_rx_complete() bonding: Fix memory leak when changing bond type to Ethernet veth: take into account peer device for NETDEV_XDP_ACT_NDO_XMIT xdp_features flag mlxfw: fix null-ptr-deref in mlxfw_mfa2_tlv_next() bnxt_en: Fix a possible NULL pointer dereference in unload path bnxt_en: Do not initialize PTP on older P3/P4 chips netfilter: nf_tables: tighten netlink attribute requirements for catch-all elements ...

Linus Torvalds committed 3 years ago

Commit 23309d62 parents cb08563 927cdea36 files · +351 −161Browse files

Showing the changes to include/linux (2 of 36 files). Show all

Unified · Split

2 files
  1. include/linux/mlx5/driver.h +0 −5
  2. include/linux/skbuff.h +3 −2
include/linux/mlx5/driver.h+0−5
@@ -1211,11 +1211,6 @@ static inline bool mlx5_core_is_vf(const struct mlx5_core_dev *dev) · 1210 unmodified lines
1211 return dev->coredev_type == MLX5_COREDEV_VF;1211 return dev->coredev_type == MLX5_COREDEV_VF;
1212}1212}
1213 1213
1214static inline bool mlx5_core_is_management_pf(const struct mlx5_core_dev *dev)
1215{
1216 return MLX5_CAP_GEN(dev, num_ports) == 1 && !MLX5_CAP_GEN(dev, native_port_num);
1217}
1218
1219static inline bool mlx5_core_is_ecpf(const struct mlx5_core_dev *dev)1214static inline bool mlx5_core_is_ecpf(const struct mlx5_core_dev *dev)
1220{1215{
1221 return dev->caps.embedded_cpu;1216 return dev->caps.embedded_cpu;
include/linux/skbuff.h+3−2
@@ -294,6 +294,7 @@ struct nf_bridge_info { · 293 unmodified lines
294 u8 pkt_otherhost:1;294 u8 pkt_otherhost:1;
295 u8 in_prerouting:1;295 u8 in_prerouting:1;
296 u8 bridged_dnat:1;296 u8 bridged_dnat:1;
297 u8 sabotage_in_done:1;
297 __u16 frag_max_size;298 __u16 frag_max_size;
298 struct net_device *physindev;299 struct net_device *physindev;
299 300
@@ -4712,7 +4713,7 @@ static inline void nf_reset_ct(struct sk_buff *skb) · 4412 unmodified lines
4712 4713
4713static inline void nf_reset_trace(struct sk_buff *skb)4714static inline void nf_reset_trace(struct sk_buff *skb)
4714{4715{
4715#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE) || defined(CONFIG_NF_TABLES)4716#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE) || IS_ENABLED(CONFIG_NF_TABLES)
4716 skb->nf_trace = 0;4717 skb->nf_trace = 0;
4717#endif4718#endif
4718}4719}
@@ -4732,7 +4733,7 @@ static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src, · 13 unmodified lines
4732 dst->_nfct = src->_nfct;4733 dst->_nfct = src->_nfct;
4733 nf_conntrack_get(skb_nfct(src));4734 nf_conntrack_get(skb_nfct(src));
4734#endif4735#endif
4735#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE) || defined(CONFIG_NF_TABLES)4736#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE) || IS_ENABLED(CONFIG_NF_TABLES)
4736 if (copy)4737 if (copy)
4737 dst->nf_trace = src->nf_trace;4738 dst->nf_trace = src->nf_trace;
4738#endif4739#endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t