Merge branch 'net-zl-array' (0b56a29f) · Commits · 戴 / test

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -225,7 +225,7 @@ struct __packed offload_info {
	struct offload_port_info ports;		struct offload_port_info ports;
	struct offload_ka_info kas;		struct offload_ka_info kas;
	struct offload_rr_info rrs;		struct offload_rr_info rrs;
	u8 buf[0];		u8 buf[];
	};		};

	struct __packed hw_atl_utils_fw_rpc {		struct __packed hw_atl_utils_fw_rpc {

drivers/net/ethernet/brocade/bna/bnad.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -253,7 +253,7 @@ struct bnad_rx_unmap_q {
	int alloc_order;		int alloc_order;
	u32 map_size;		u32 map_size;
	enum bnad_rxbuf_type type;		enum bnad_rxbuf_type type;
	struct bnad_rx_unmap unmap[0] ____cacheline_aligned;		struct bnad_rx_unmap unmap[] ____cacheline_aligned;
	};		};

	#define BNAD_PCI_DEV_IS_CAT2(_bnad) \		#define BNAD_PCI_DEV_IS_CAT2(_bnad) \

drivers/net/ethernet/tehuti/tehuti.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -330,7 +330,7 @@ struct txd_desc {
	u16 length;		u16 length;
	u32 va_lo;		u32 va_lo;
	u32 va_hi;		u32 va_hi;
	struct pbl pbl[0]; /* Fragments */		struct pbl pbl[]; /* Fragments */
	} __packed;		} __packed;

	/* Register region size */		/* Register region size */

drivers/net/usb/r8152.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -891,7 +891,7 @@ struct fw_block {
	struct fw_header {		struct fw_header {
	u8 checksum[32];		u8 checksum[32];
	char version[RTL_VER_SIZE];		char version[RTL_VER_SIZE];
	struct fw_block blocks[0];		struct fw_block blocks[];
	} __packed;		} __packed;

	/**		/**
	@@ -930,7 +930,7 @@ struct fw_mac {
	__le32 reserved;		__le32 reserved;
	__le16 fw_ver_reg;		__le16 fw_ver_reg;
	u8 fw_ver_data;		u8 fw_ver_data;
	char info[0];		char info[];
	} __packed;		} __packed;

	/**		/**
	@@ -982,7 +982,7 @@ struct fw_phy_nc {
	__le16 bp_start;		__le16 bp_start;
	__le16 bp_num;		__le16 bp_num;
	__le16 bp[4];		__le16 bp[4];
	char info[0];		char info[];
	} __packed;		} __packed;

	enum rtl_fw_type {		enum rtl_fw_type {

include/linux/netdevice.h

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -664,7 +664,7 @@ static inline void netdev_queue_numa_node_write(struct netdev_queue *q, int node
	struct rps_map {		struct rps_map {
	unsigned int len;		unsigned int len;
	struct rcu_head rcu;		struct rcu_head rcu;
	u16 cpus[0];		u16 cpus[];
	};		};
	#define RPS_MAP_SIZE(_num) (sizeof(struct rps_map) + ((_num) * sizeof(u16)))		#define RPS_MAP_SIZE(_num) (sizeof(struct rps_map) + ((_num) * sizeof(u16)))

	@@ -686,7 +686,7 @@ struct rps_dev_flow {
	struct rps_dev_flow_table {		struct rps_dev_flow_table {
	unsigned int mask;		unsigned int mask;
	struct rcu_head rcu;		struct rcu_head rcu;
	struct rps_dev_flow flows[0];		struct rps_dev_flow flows[];
	};		};
	#define RPS_DEV_FLOW_TABLE_SIZE(_num) (sizeof(struct rps_dev_flow_table) + \		#define RPS_DEV_FLOW_TABLE_SIZE(_num) (sizeof(struct rps_dev_flow_table) + \
	((_num) * sizeof(struct rps_dev_flow)))		((_num) * sizeof(struct rps_dev_flow)))
	@@ -704,7 +704,7 @@ struct rps_dev_flow_table {
	struct rps_sock_flow_table {		struct rps_sock_flow_table {
	u32 mask;		u32 mask;

	u32 ents[0] ____cacheline_aligned_in_smp;		u32 ents[] ____cacheline_aligned_in_smp;
	};		};
	#define RPS_SOCK_FLOW_TABLE_SIZE(_num) (offsetof(struct rps_sock_flow_table, ents[_num]))		#define RPS_SOCK_FLOW_TABLE_SIZE(_num) (offsetof(struct rps_sock_flow_table, ents[_num]))

	@@ -767,7 +767,7 @@ struct xps_map {
	unsigned int len;		unsigned int len;
	unsigned int alloc_len;		unsigned int alloc_len;
	struct rcu_head rcu;		struct rcu_head rcu;
	u16 queues[0];		u16 queues[];
	};		};
	#define XPS_MAP_SIZE(_num) (sizeof(struct xps_map) + ((_num) * sizeof(u16)))		#define XPS_MAP_SIZE(_num) (sizeof(struct xps_map) + ((_num) * sizeof(u16)))
	#define XPS_MIN_MAP_ALLOC ((L1_CACHE_ALIGN(offsetof(struct xps_map, queues[1])) \		#define XPS_MIN_MAP_ALLOC ((L1_CACHE_ALIGN(offsetof(struct xps_map, queues[1])) \
	@@ -778,7 +778,7 @@ struct xps_map {
	*/		*/
	struct xps_dev_maps {		struct xps_dev_maps {
	struct rcu_head rcu;		struct rcu_head rcu;
	struct xps_map __rcu attr_map[0]; / Either CPUs map or RXQs map */		struct xps_map __rcu attr_map[]; / Either CPUs map or RXQs map */
	};		};

	#define XPS_CPU_DEV_MAPS_SIZE(_tcs) (sizeof(struct xps_dev_maps) + \		#define XPS_CPU_DEV_MAPS_SIZE(_tcs) (sizeof(struct xps_dev_maps) + \

Admin message