Commit 62a0e2fa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from netfilter.

  It looks like that most people are still traveling: both the ML volume
  and the processing capacity are low.

  Previous releases - regressions:

    - netfilter:
        - nf_reject_ipv6: fix nf_reject_ip6_tcphdr_put()
        - nf_tables: keep deleted flowtable hooks until after RCU

    - tcp: check skb is non-NULL in tcp_rto_delta_us()

    - phy: aquantia: fix -ETIMEDOUT PHY probe failure when firmware not
      present

    - eth: virtio_net: fix mismatched buf address when unmapping for
      small packets

    - eth: stmmac: fix zero-division error when disabling tc cbs

    - eth: bonding: fix unnecessary warnings and logs from
      bond_xdp_get_xmit_slave()

  Previous releases - always broken:

    - netfilter:
        - fix clash resolution for bidirectional flows
        - fix allocation with no memcg accounting

    - eth: r8169: add tally counter fields added with RTL8125

    - eth: ravb: fix rx and tx frame size limit"

* tag 'net-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (35 commits)
  selftests: netfilter: Avoid hanging ipvs.sh
  kselftest: add test for nfqueue induced conntrack race
  netfilter: nfnetlink_queue: remove old clash resolution logic
  netfilter: nf_tables: missing objects with no memcg accounting
  netfilter: nf_tables: use rcu chain hook list iterator from netlink dump path
  netfilter: ctnetlink: compile ctnetlink_label_size with CONFIG_NF_CONNTRACK_EVENTS
  netfilter: nf_reject: Fix build warning when CONFIG_BRIDGE_NETFILTER=n
  netfilter: nf_tables: Keep deleted flowtable hooks until after RCU
  docs: tproxy: ignore non-transparent sockets in iptables
  netfilter: ctnetlink: Guard possible unused functions
  selftests: netfilter: nft_tproxy.sh: add tcp tests
  selftests: netfilter: add reverse-clash resolution test case
  netfilter: conntrack: add clash resolution for reverse collisions
  netfilter: nf_nat: don't try nat source port reallocation for reverse dir clash
  selftests/net: packetdrill: increase timing tolerance in debug mode
  usbnet: fix cyclical race on disconnect with work queue
  net: stmmac: set PP_FLAG_DMA_SYNC_DEV only if XDP is enabled
  virtio_net: Fix mismatched buf address when unmapping for small packets
  bonding: Fix unnecessary warnings and logs from bond_xdp_get_xmit_slave()
  r8169: add missing MODULE_FIRMWARE entry for RTL8126A rev.b
  ...
parents 5e546643 aef3a58b

Documentation/networking/tproxy.rst

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ The idea is that you identify packets with destination address matching a local 
socket on your box, set the packet mark to a certain value::



    # iptables -t mangle -N DIVERT

    # iptables -t mangle -A PREROUTING -p tcp -m socket -j DIVERT

    # iptables -t mangle -A PREROUTING -p tcp -m socket --transparent -j DIVERT

    # iptables -t mangle -A DIVERT -j MARK --set-mark 1

    # iptables -t mangle -A DIVERT -j ACCEPT

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -17316,8 +17316,8 @@ M: Parthiban Veerasooran <parthiban.veerasooran@microchip.com> 
L:	netdev@vger.kernel.org

S:	Maintained

F:	Documentation/networking/oa-tc6-framework.rst

F:	drivers/include/linux/oa_tc6.h

F:	drivers/net/ethernet/oa_tc6.c

F:	include/linux/oa_tc6.h









OPEN FIRMWARE AND FLATTENED DEVICE TREE









M:	Rob Herring <robh@kernel.org>

























drivers/net/bonding/bond_main.c



+3
−3






























Original line number
Diff line number
Diff line







@@ -5610,9 +5610,9 @@ bond_xdp_get_xmit_slave(struct net_device *bond_dev, struct xdp_buff *xdp)







		break;



















	default:









		/* Should never happen. Mode guarded by bond_xdp_check() */









		netdev_err(bond_dev, "Unknown bonding mode %d for xdp xmit\n", BOND_MODE(bond));









		WARN_ON_ONCE(1);









		if (net_ratelimit())









			netdev_err(bond_dev, "Unknown bonding mode %d for xdp xmit\n",









				   BOND_MODE(bond));









		return NULL;









	}










































drivers/net/ethernet/realtek/r8169_main.c



+28
−0






























Original line number
Diff line number
Diff line







@@ -579,6 +579,33 @@ struct rtl8169_counters {







	__le32	rx_multicast;









	__le16	tx_aborted;









	__le16	tx_underrun;









	/* new since RTL8125 */









	__le64 tx_octets;









	__le64 rx_octets;









	__le64 rx_multicast64;









	__le64 tx_unicast64;









	__le64 tx_broadcast64;









	__le64 tx_multicast64;









	__le32 tx_pause_on;









	__le32 tx_pause_off;









	__le32 tx_pause_all;









	__le32 tx_deferred;









	__le32 tx_late_collision;









	__le32 tx_all_collision;









	__le32 tx_aborted32;









	__le32 align_errors32;









	__le32 rx_frame_too_long;









	__le32 rx_runt;









	__le32 rx_pause_on;









	__le32 rx_pause_off;









	__le32 rx_pause_all;









	__le32 rx_unknown_opcode;









	__le32 rx_mac_error;









	__le32 tx_underrun32;









	__le32 rx_mac_missed;









	__le32 rx_tcam_dropped;









	__le32 tdu;









	__le32 rdu;









};



















struct rtl8169_tc_offsets {








@@ -681,6 +708,7 @@ MODULE_FIRMWARE(FIRMWARE_8107E_2);







MODULE_FIRMWARE(FIRMWARE_8125A_3);









MODULE_FIRMWARE(FIRMWARE_8125B_2);









MODULE_FIRMWARE(FIRMWARE_8126A_2);









MODULE_FIRMWARE(FIRMWARE_8126A_3);



















static inline struct device *tp_to_dev(struct rtl8169_private *tp)









{
































drivers/net/ethernet/renesas/ravb.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -1052,6 +1052,7 @@ struct ravb_hw_info {







	netdev_features_t net_features;









	int stats_len;









	u32 tccr_mask;









	u32 tx_max_frame_size;









	u32 rx_max_frame_size;









	u32 rx_buffer_size;









	u32 rx_desc_size;