Commit 8aaaf2f3 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



Merge in fixes directly in prep for the 5.17 merge window.
No conflicts.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 208dd45d dd3ca4c5

drivers/net/amt.c

+1 −1
Original line number Diff line number Diff line
@@ -1107,7 +1107,7 @@ static bool amt_send_membership_query(struct amt_dev *amt, 
	rt = ip_route_output_key(amt->net, &fl4);

	if (IS_ERR(rt)) {

		netdev_dbg(amt->dev, "no route to %pI4\n", &tunnel->ip4);

		return -1;

		return true;

	}



	amtmq		= skb_push(skb, sizeof(*amtmq));

drivers/net/can/rcar/rcar_canfd.c

+2 −3
Original line number Diff line number Diff line
@@ -1633,8 +1633,7 @@ static int rcar_canfd_channel_probe(struct rcar_canfd_global *gpriv, u32 ch, 
	ndev = alloc_candev(sizeof(*priv), RCANFD_FIFO_DEPTH);

	if (!ndev) {

		dev_err(&pdev->dev, "alloc_candev() failed\n");

		err = -ENOMEM;

		goto fail;

		return -ENOMEM;

	}

	priv = netdev_priv(ndev);
@@ -1730,8 +1729,8 @@ static int rcar_canfd_channel_probe(struct rcar_canfd_global *gpriv, u32 ch, 


fail_candev:

	netif_napi_del(&priv->napi);

	free_candev(ndev);

fail:

	free_candev(ndev);

	return err;

}

drivers/net/can/softing/softing_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ static int softingcs_probe(struct pcmcia_device *pcmcia) 
	return 0;



platform_failed:

	kfree(dev);

	platform_device_put(pdev);

mem_failed:

pcmcia_bad:

pcmcia_failed:

drivers/net/can/softing/softing_fw.c

+6 −5
Original line number Diff line number Diff line
@@ -565,18 +565,19 @@ int softing_startstop(struct net_device *dev, int up) 
		if (ret < 0)

			goto failed;

	}

	/* enable_error_frame */

	/*



	/* enable_error_frame

	 *

	 * Error reporting is switched off at the moment since

	 * the receiving of them is not yet 100% verified

	 * This should be enabled sooner or later

	 *

	if (error_reporting) {

	 */

	if (0 && error_reporting) {

		ret = softing_fct_cmd(card, 51, "enable_error_frame");

		if (ret < 0)

			goto failed;

	}

	*/



	/* initialize interface */

	iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 2]);

	iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 4]);

drivers/net/can/usb/gs_usb.c

+4 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static void gs_usb_receive_bulk_callback(struct urb *urb) 


	/* device reports out of range channel id */

	if (hf->channel >= GS_MAX_INTF)

		goto resubmit_urb;

		goto device_detach;



	dev = usbcan->canch[hf->channel];
@@ -405,6 +405,7 @@ static void gs_usb_receive_bulk_callback(struct urb *urb) 


	/* USB failure take down all interfaces */

	if (rc == -ENODEV) {

 device_detach:

		for (rc = 0; rc < GS_MAX_INTF; rc++) {

			if (usbcan->canch[rc])

				netif_device_detach(usbcan->canch[rc]->netdev);
@@ -506,6 +507,8 @@ static netdev_tx_t gs_can_start_xmit(struct sk_buff *skb, 


	hf->echo_id = idx;

	hf->channel = dev->channel;

	hf->flags = 0;

	hf->reserved = 0;



	cf = (struct can_frame *)skb->data;