Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net (12628565) · Commits · EulixOS / Software / Kernel

MAINTAINERS

+5 −5

Original line number	Diff line number	Diff line
		@@ -12910,7 +12910,7 @@ F: net/ipv4/nexthop.c

		NFC SUBSYSTEM
		M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
		L: linux-nfc@lists.01.org (moderated for non-subscribers)
		L: linux-nfc@lists.01.org (subscribers-only)
		L: netdev@vger.kernel.org
		S: Maintained
		F: Documentation/devicetree/bindings/net/nfc/
		@@ -12923,7 +12923,7 @@ F: net/nfc/
		NFC VIRTUAL NCI DEVICE DRIVER
		M: Bongsu Jeon <bongsu.jeon@samsung.com>
		L: netdev@vger.kernel.org
		L: linux-nfc@lists.01.org (moderated for non-subscribers)
		L: linux-nfc@lists.01.org (subscribers-only)
		S: Supported
		F: drivers/nfc/virtual_ncidev.c
		F: tools/testing/selftests/nci/
		@@ -13229,7 +13229,7 @@ F: sound/soc/codecs/tfa9879*

		NXP-NCI NFC DRIVER
		R: Charles Gorand <charles.gorand@effinnov.com>
		L: linux-nfc@lists.01.org (moderated for non-subscribers)
		L: linux-nfc@lists.01.org (subscribers-only)
		S: Supported
		F: drivers/nfc/nxp-nci

		@@ -16156,7 +16156,7 @@ F: include/media/drv-intf/s3c_camif.h
		SAMSUNG S3FWRN5 NFC DRIVER
		M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
		M: Krzysztof Opasiak <k.opasiak@samsung.com>
		L: linux-nfc@lists.01.org (moderated for non-subscribers)
		L: linux-nfc@lists.01.org (subscribers-only)
		S: Maintained
		F: Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml
		F: drivers/nfc/s3fwrn5
		@@ -18347,7 +18347,7 @@ F: sound/soc/codecs/tas571x*
		TI TRF7970A NFC DRIVER
		M: Mark Greer <mgreer@animalcreek.com>
		L: linux-wireless@vger.kernel.org
		L: linux-nfc@lists.01.org (moderated for non-subscribers)
		L: linux-nfc@lists.01.org (subscribers-only)
		S: Supported
		F: Documentation/devicetree/bindings/net/nfc/trf7970a.txt
		F: drivers/nfc/trf7970a.c

drivers/bluetooth/btusb.c

+21 −2

Original line number	Diff line number	Diff line
		@@ -2527,10 +2527,17 @@ static int btusb_intel_download_firmware_newgen(struct hci_dev *hdev,
		}

		btusb_setup_intel_newgen_get_fw_name(ver, fwname, sizeof(fwname), "sfi");
		err = request_firmware(&fw, fwname, &hdev->dev);
		err = firmware_request_nowarn(&fw, fwname, &hdev->dev);
		if (err < 0) {
		if (!test_bit(BTUSB_BOOTLOADER, &data->flags)) {
		/* Firmware has already been loaded */
		set_bit(BTUSB_FIRMWARE_LOADED, &data->flags);
		return 0;
		}

		bt_dev_err(hdev, "Failed to load Intel firmware file %s (%d)",
		fwname, err);

		return err;
		}

		@@ -2680,12 +2687,24 @@ static int btusb_intel_download_firmware(struct hci_dev *hdev,
		err = btusb_setup_intel_new_get_fw_name(ver, params, fwname,
		sizeof(fwname), "sfi");
		if (err < 0) {
		if (!test_bit(BTUSB_BOOTLOADER, &data->flags)) {
		/* Firmware has already been loaded */
		set_bit(BTUSB_FIRMWARE_LOADED, &data->flags);
		return 0;
		}

		bt_dev_err(hdev, "Unsupported Intel firmware naming");
		return -EINVAL;
		}

		err = request_firmware(&fw, fwname, &hdev->dev);
		err = firmware_request_nowarn(&fw, fwname, &hdev->dev);
		if (err < 0) {
		if (!test_bit(BTUSB_BOOTLOADER, &data->flags)) {
		/* Firmware has already been loaded */
		set_bit(BTUSB_FIRMWARE_LOADED, &data->flags);
		return 0;
		}

		bt_dev_err(hdev, "Failed to load Intel firmware file %s (%d)",
		fwname, err);
		return err;

drivers/net/ethernet/chelsio/cxgb4/cxgb4.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -2177,8 +2177,6 @@ int cxgb4_update_mac_filt(struct port_info *pi, unsigned int viid,
		bool persistent, u8 *smt_idx);
		int cxgb4_get_msix_idx_from_bmap(struct adapter *adap);
		void cxgb4_free_msix_idx_in_bmap(struct adapter *adap, u32 msix_idx);
		int cxgb_open(struct net_device *dev);
		int cxgb_close(struct net_device *dev);
		void cxgb4_enable_rx(struct adapter adap, struct sge_rspq q);
		void cxgb4_quiesce_rx(struct sge_rspq *q);
		int cxgb4_port_mirror_alloc(struct net_device *dev);

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2834,7 +2834,7 @@ static void cxgb_down(struct adapter *adapter)
		/*
		* net_device operations
		*/
		int cxgb_open(struct net_device *dev)
		static int cxgb_open(struct net_device *dev)
		{
		struct port_info *pi = netdev_priv(dev);
		struct adapter *adapter = pi->adapter;
		@@ -2882,7 +2882,7 @@ int cxgb_open(struct net_device *dev)
		return err;
		}

		int cxgb_close(struct net_device *dev)
		static int cxgb_close(struct net_device *dev)
		{
		struct port_info *pi = netdev_priv(dev);
		struct adapter *adapter = pi->adapter;

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c

+5 −9

Original line number	Diff line number	Diff line
		@@ -997,20 +997,16 @@ int cxgb4_tc_flower_destroy(struct net_device *dev,
		if (!ch_flower)
		return -ENOENT;

		rhashtable_remove_fast(&adap->flower_tbl, &ch_flower->node,
		adap->flower_ht_params);

		ret = cxgb4_flow_rule_destroy(dev, ch_flower->fs.tc_prio,
		&ch_flower->fs, ch_flower->filter_id);
		if (ret)
		goto err;
		netdev_err(dev, "Flow rule destroy failed for tid: %u, ret: %d",
		ch_flower->filter_id, ret);

		ret = rhashtable_remove_fast(&adap->flower_tbl, &ch_flower->node,
		adap->flower_ht_params);
		if (ret) {
		netdev_err(dev, "Flow remove from rhashtable failed");
		goto err;
		}
		kfree_rcu(ch_flower, rcu);

		err:
		return ret;
		}