net/ehea: bitops work on unsigned longs (48e4cc77) · Commits · 戴 / test

The flags field of struct ehea_port is only used with test_bit(), clear_bit() and set_bit() and these interfaces only work on "unsigned long"s, so change the field to be an "unsigned long". Also, this field only has two bits defined for it (0 and 1) so will still be fine if someone builds this driver for a 32 bit arch (at least as far as this flags field is concerned). Also note that ehea_driver_flags is only used in ehca_main.c, so make it static in there. Signed-off-by:

Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/ehea/ehea.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -478,7 +478,7 @@ struct ehea_port {
		int num_add_tx_qps;
		int num_mcs;
		int resets;
		u64 flags;
		unsigned long flags;
		u64 mac_addr;
		u32 logical_port_id;
		u32 port_speed;
		@@ -510,7 +510,6 @@ void ehea_set_ethtool_ops(struct net_device *netdev);
		int ehea_sense_port_attr(struct ehea_port *port);
		int ehea_set_portspeed(struct ehea_port *port, u32 port_speed);

		extern u64 ehea_driver_flags;
		extern struct work_struct ehea_rereg_mr_task;

		#endif /* __EHEA_H__ */

drivers/net/ehea/ehea_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ MODULE_PARM_DESC(use_lro, " Large Receive Offload, 1: enable, 0: disable, "

		static int port_name_cnt;
		static LIST_HEAD(adapter_list);
		u64 ehea_driver_flags;
		static unsigned long ehea_driver_flags;
		struct work_struct ehea_rereg_mr_task;
		static DEFINE_MUTEX(dlpar_mem_lock);
		struct ehea_fw_handle_array ehea_fw_handles;

Admin message