hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
....@@ -1,8 +1,7 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
12 /*
23 * QLogic qlcnic NIC Driver
34 * Copyright (c) 2009-2013 QLogic Corporation
4
- *
5
- * See LICENSE.qlcnic for copyright and licensing details.
65 */
76
87 #ifndef _QLCNIC_H_
....@@ -418,7 +417,7 @@
418417 u32 saved_state[16];
419418 u32 cap_sizes[8];
420419 u32 ocm_wnd_reg[16];
421
- u32 rsvd[0];
420
+ u32 rsvd[];
422421 };
423422
424423 struct qlcnic_82xx_dump_template_hdr {
....@@ -436,7 +435,7 @@
436435 u32 cap_sizes[8];
437436 u32 rsvd[7];
438437 u32 capabilities;
439
- u32 rsvd1[0];
438
+ u32 rsvd1[];
440439 };
441440
442441 #define QLC_PEX_DMA_READ_SIZE (PAGE_SIZE * 16)
....@@ -497,7 +496,7 @@
497496 u16 board_type;
498497 u16 supported_type;
499498
500
- u16 link_speed;
499
+ u32 link_speed;
501500 u16 link_duplex;
502501 u16 link_autoneg;
503502 u16 module_type;
....@@ -536,8 +535,6 @@
536535 u8 extend_lb_time;
537536 u8 phys_port_id[ETH_ALEN];
538537 u8 lb_mode;
539
- u8 vxlan_port_count;
540
- u16 vxlan_port;
541538 struct device *hwmon_dev;
542539 u32 post_mode;
543540 bool run_post;
....@@ -740,7 +737,7 @@
740737 The following is packed:
741738 - N hostrq_rds_rings
742739 - N hostrq_sds_rings */
743
- char data[0];
740
+ char data[];
744741 } __packed;
745742
746743 struct qlcnic_cardrsp_rds_ring{
....@@ -769,7 +766,7 @@
769766 The following is packed:
770767 - N cardrsp_rds_rings
771768 - N cardrs_sds_rings */
772
- char data[0];
769
+ char data[];
773770 } __packed;
774771
775772 #define SIZEOF_HOSTRQ_RX(HOSTRQ_RX, rds_rings, sds_rings) \
....@@ -1025,9 +1022,6 @@
10251022 #define QLCNIC_APP_CHANGED_FLAGS 0x20000
10261023 #define QLCNIC_HAS_PHYS_PORT_ID 0x40000
10271024 #define QLCNIC_TSS_RSS 0x80000
1028
-
1029
-#define QLCNIC_ADD_VXLAN_PORT 0x100000
1030
-#define QLCNIC_DEL_VXLAN_PORT 0x200000
10311025
10321026 #define QLCNIC_VLAN_FILTERING 0x800000
10331027
....@@ -1700,6 +1694,8 @@
17001694 int qlcnic_set_default_offload_settings(struct qlcnic_adapter *);
17011695 int qlcnic_reset_npar_config(struct qlcnic_adapter *);
17021696 int qlcnic_set_eswitch_port_config(struct qlcnic_adapter *);
1697
+int qlcnic_set_vxlan_port(struct qlcnic_adapter *adapter, u16 port);
1698
+int qlcnic_set_vxlan_parsing(struct qlcnic_adapter *adapter, u16 port);
17031699 int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter);
17041700 int qlcnic_read_mac_addr(struct qlcnic_adapter *);
17051701 int qlcnic_setup_netdev(struct qlcnic_adapter *, struct net_device *, int);
....@@ -1878,12 +1874,6 @@
18781874 loff_t offset, size_t size)
18791875 {
18801876 adapter->ahw->hw_ops->write_crb(adapter, buf, offset, size);
1881
-}
1882
-
1883
-static inline int qlcnic_hw_write_wx_2M(struct qlcnic_adapter *adapter,
1884
- ulong off, u32 data)
1885
-{
1886
- return adapter->ahw->hw_ops->write_reg(adapter, off, data);
18871877 }
18881878
18891879 static inline int qlcnic_get_mac_address(struct qlcnic_adapter *adapter,