~hc/RK356X_SDK_RELEASE.git

..	..	@@ -5,6 +5,7 @@
5	5	#include <linux/if_ether.h>
6	6	#include <linux/gfp.h>
7	7	#include <linux/if_vlan.h>
	8	+#include <generated/utsrelease.h>
8	9	#include <scsi/scsi_cmnd.h>
9	10	#include <scsi/scsi_device.h>
10	11	#include <scsi/fc/fc_fs.h>
..	..	@@ -443,7 +444,7 @@
443	444	ddp->err = (__force u32)ddp_err;
444	445	ddp->sgl = NULL;
445	446	ddp->sgc = 0;
446		- /* fall through */
	447	+ fallthrough;
447	448	/* if DDP length is present pass it through to ULD */
448	449	case cpu_to_le32(IXGBE_RXDADV_STAT_FCSTAT_NODDP):
449	450	/* update length of DDPed data */
..	..	@@ -968,8 +969,7 @@
968	969	{
969	970	struct ixgbe_adapter *adapter = netdev_priv(netdev);
970	971	struct ixgbe_hw *hw = &adapter->hw;
971		- int i, pos;
972		- u8 buf[8];
	972	+ u64 dsn;
973	973
974	974	if (!info)
975	975	return -EINVAL;
..	..	@@ -985,17 +985,11 @@
985	985	/* Serial Number */
986	986
987	987	/* Get the PCI-e Device Serial Number Capability */
988		- pos = pci_find_ext_capability(adapter->pdev, PCI_EXT_CAP_ID_DSN);
989		- if (pos) {
990		- pos += 4;
991		- for (i = 0; i < 8; i++)
992		- pci_read_config_byte(adapter->pdev, pos + i, &buf[i]);
993		-
	988	+ dsn = pci_get_dsn(adapter->pdev);
	989	+ if (dsn)
994	990	snprintf(info->serial_number, sizeof(info->serial_number),
995		- "%02X%02X%02X%02X%02X%02X%02X%02X",
996		- buf[7], buf[6], buf[5], buf[4],
997		- buf[3], buf[2], buf[1], buf[0]);
998		- } else
	991	+ "%016llX", dsn);
	992	+ else
999	993	snprintf(info->serial_number, sizeof(info->serial_number),
1000	994	"Unknown");
1001	995
..	..	@@ -1008,7 +1002,7 @@
1008	1002	sizeof(info->driver_version),
1009	1003	"%s v%s",
1010	1004	ixgbe_driver_name,
1011		- ixgbe_driver_version);
	1005	+ UTS_RELEASE);
1012	1006	/* Firmware Version */
1013	1007	strlcpy(info->firmware_version, adapter->eeprom_id,
1014	1008	sizeof(info->firmware_version));