Commit d3fa86b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from bpf.

  Current release - regressions:

   - Revert "net: r8169: Disable multicast filter for RTL8168H and
     RTL8107E"

   - kselftest: rtnetlink: fix ip route command typo

  Current release - new code bugs:

   - s390/ism: make sure ism driver implies smc protocol in kconfig

   - two build fixes for tools/net

  Previous releases - regressions:

   - rxrpc: couple of ACK/PING/RTT handling fixes

  Previous releases - always broken:

   - bpf: verify bpf_loop() callbacks as if they are called unknown
     number of times

   - improve stability of auto-bonding with Hyper-V

   - account BPF-neigh-redirected traffic in interface statistics

  Misc:

   - net: fill in some more MODULE_DESCRIPTION()s"

* tag 'net-6.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (58 commits)
  tools: ynl: fix duplicate op name in devlink
  tools: ynl: fix header path for nfsd
  net: ipa: fix one GSI register field width
  tls: fix NULL deref on tls_sw_splice_eof() with empty record
  net: axienet: Fix check for partial TX checksum
  vsock/test: fix SEQPACKET message bounds test
  i40e: Fix adding unsupported cloud filters
  ice: restore timestamp configuration after device reset
  ice: unify logic for programming PFINT_TSYN_MSK
  ice: remove ptp_tx ring parameter flag
  amd-xgbe: propagate the correct speed and duplex status
  amd-xgbe: handle the corner-case during tx completion
  amd-xgbe: handle corner-case during sfp hotplug
  net: veth: fix ethtool stats reporting
  octeontx2-pf: Fix ntuple rule creation to direct packet to VF with higher Rx queue than its PF
  net: usb: qmi_wwan: claim interface 4 for ZTE MF290
  Revert "net: r8169: Disable multicast filter for RTL8168H and RTL8107E"
  net/smc: avoid data corruption caused by decline
  nfc: virtual_ncidev: Add variable to check if ndev is running
  dpll: Fix potential msg memleak when genlmsg_put_reply failed
  ...
parents 9b6de136 39f04b14

Documentation/process/maintainer-netdev.rst

+17 −3
Original line number Diff line number Diff line
@@ -193,9 +193,23 @@ Review timelines 
Generally speaking, the patches get triaged quickly (in less than

48h). But be patient, if your patch is active in patchwork (i.e. it's

listed on the project's patch list) the chances it was missed are close to zero.

Asking the maintainer for status updates on your

patch is a good way to ensure your patch is ignored or pushed to the

bottom of the priority list.



The high volume of development on netdev makes reviewers move on

from discussions relatively quickly. New comments and replies

are very unlikely to arrive after a week of silence. If a patch

is no longer active in patchwork and the thread went idle for more

than a week - clarify the next steps and/or post the next version.



For RFC postings specifically, if nobody responded in a week - reviewers

either missed the posting or have no strong opinions. If the code is ready,

repost as a PATCH.



Emails saying just "ping" or "bump" are considered rude. If you can't figure

out the status of the patch from patchwork or where the discussion has

landed - describe your best guess and ask if it's correct. For example::



  I don't understand what the next steps are. Person X seems to be unhappy

  with A, should I do B and repost the patches?



.. _Changes requested:

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -14992,6 +14992,7 @@ M: Jakub Kicinski <kuba@kernel.org> 
M:	Paolo Abeni <pabeni@redhat.com>

L:	netdev@vger.kernel.org

S:	Maintained

P:	Documentation/process/maintainer-netdev.rst

Q:	https://patchwork.kernel.org/project/netdevbpf/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
@@ -15043,6 +15044,7 @@ M: Jakub Kicinski <kuba@kernel.org> 
M:	Paolo Abeni <pabeni@redhat.com>

L:	netdev@vger.kernel.org

S:	Maintained

P:	Documentation/process/maintainer-netdev.rst

Q:	https://patchwork.kernel.org/project/netdevbpf/list/

B:	mailto:netdev@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
@@ -15053,6 +15055,7 @@ F: Documentation/networking/ 
F:	Documentation/process/maintainer-netdev.rst

F:	Documentation/userspace-api/netlink/

F:	include/linux/in.h

F:	include/linux/indirect_call_wrapper.h

F:	include/linux/net.h

F:	include/linux/netdevice.h

F:	include/net/

drivers/dpll/dpll_netlink.c

+12 −5
Original line number Diff line number Diff line
@@ -1093,9 +1093,10 @@ int dpll_nl_pin_id_get_doit(struct sk_buff *skb, struct genl_info *info) 
		return -ENOMEM;

	hdr = genlmsg_put_reply(msg, info, &dpll_nl_family, 0,

				DPLL_CMD_PIN_ID_GET);

	if (!hdr)

	if (!hdr) {

		nlmsg_free(msg);

		return -EMSGSIZE;



	}

	pin = dpll_pin_find_from_nlattr(info);

	if (!IS_ERR(pin)) {

		ret = dpll_msg_add_pin_handle(msg, pin);
@@ -1123,8 +1124,10 @@ int dpll_nl_pin_get_doit(struct sk_buff *skb, struct genl_info *info) 
		return -ENOMEM;

	hdr = genlmsg_put_reply(msg, info, &dpll_nl_family, 0,

				DPLL_CMD_PIN_GET);

	if (!hdr)

	if (!hdr) {

		nlmsg_free(msg);

		return -EMSGSIZE;

	}

	ret = dpll_cmd_pin_get_one(msg, pin, info->extack);

	if (ret) {

		nlmsg_free(msg);
@@ -1256,8 +1259,10 @@ int dpll_nl_device_id_get_doit(struct sk_buff *skb, struct genl_info *info) 
		return -ENOMEM;

	hdr = genlmsg_put_reply(msg, info, &dpll_nl_family, 0,

				DPLL_CMD_DEVICE_ID_GET);

	if (!hdr)

	if (!hdr) {

		nlmsg_free(msg);

		return -EMSGSIZE;

	}



	dpll = dpll_device_find_from_nlattr(info);

	if (!IS_ERR(dpll)) {
@@ -1284,8 +1289,10 @@ int dpll_nl_device_get_doit(struct sk_buff *skb, struct genl_info *info) 
		return -ENOMEM;

	hdr = genlmsg_put_reply(msg, info, &dpll_nl_family, 0,

				DPLL_CMD_DEVICE_GET);

	if (!hdr)

	if (!hdr) {

		nlmsg_free(msg);

		return -EMSGSIZE;

	}



	ret = dpll_device_get_one(dpll, msg, info->extack);

	if (ret) {

drivers/net/ethernet/amd/xgbe/xgbe-drv.c

+14 −0
Original line number Diff line number Diff line
@@ -682,10 +682,24 @@ static void xgbe_service(struct work_struct *work) 
static void xgbe_service_timer(struct timer_list *t)

{

	struct xgbe_prv_data *pdata = from_timer(pdata, t, service_timer);

	struct xgbe_channel *channel;

	unsigned int i;



	queue_work(pdata->dev_workqueue, &pdata->service_work);



	mod_timer(&pdata->service_timer, jiffies + HZ);



	if (!pdata->tx_usecs)

		return;



	for (i = 0; i < pdata->channel_count; i++) {

		channel = pdata->channel[i];

		if (!channel->tx_ring || channel->tx_timer_active)

			break;

		channel->tx_timer_active = 1;

		mod_timer(&channel->tx_timer,

			  jiffies + usecs_to_jiffies(pdata->tx_usecs));

	}

}



static void xgbe_init_timers(struct xgbe_prv_data *pdata)

drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c

+8 −3
Original line number Diff line number Diff line
@@ -314,10 +314,15 @@ static int xgbe_get_link_ksettings(struct net_device *netdev, 


	cmd->base.phy_address = pdata->phy.address;



	cmd->base.autoneg = pdata->phy.autoneg;

	if (netif_carrier_ok(netdev)) {

		cmd->base.speed = pdata->phy.speed;

		cmd->base.duplex = pdata->phy.duplex;

	} else {

		cmd->base.speed = SPEED_UNKNOWN;

		cmd->base.duplex = DUPLEX_UNKNOWN;

	}



	cmd->base.autoneg = pdata->phy.autoneg;

	cmd->base.port = PORT_NONE;



	XGBE_LM_COPY(cmd, supported, lks, supported);