forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/drivers/net/ethernet/amd/xgbe/xgbe.h
....@@ -135,7 +135,6 @@
135135 #include <linux/list.h>
136136
137137 #define XGBE_DRV_NAME "amd-xgbe"
138
-#define XGBE_DRV_VERSION "1.0.3"
139138 #define XGBE_DRV_DESC "AMD 10 Gigabit Ethernet Driver"
140139
141140 /* Descriptor related defines */
....@@ -290,6 +289,7 @@
290289 /* Auto-negotiation */
291290 #define XGBE_AN_MS_TIMEOUT 500
292291 #define XGBE_LINK_TIMEOUT 5
292
+#define XGBE_KR_TRAINING_WAIT_ITER 50
293293
294294 #define XGBE_SGMII_AN_LINK_STATUS BIT(1)
295295 #define XGBE_SGMII_AN_LINK_SPEED (BIT(2) | BIT(3))
....@@ -1015,12 +1015,6 @@
10151015 unsigned int an_cdr_workaround;
10161016 };
10171017
1018
-struct xgbe_vxlan_data {
1019
- struct list_head list;
1020
- sa_family_t sa_family;
1021
- __be16 port;
1022
-};
1023
-
10241018 struct xgbe_prv_data {
10251019 struct net_device *netdev;
10261020 struct pci_dev *pcidev;
....@@ -1173,13 +1167,7 @@
11731167 u32 rss_options;
11741168
11751169 /* VXLAN settings */
1176
- unsigned int vxlan_port_set;
1177
- unsigned int vxlan_offloads_set;
1178
- unsigned int vxlan_force_disable;
1179
- unsigned int vxlan_port_count;
1180
- struct list_head vxlan_ports;
11811170 u16 vxlan_port;
1182
- netdev_features_t vxlan_features;
11831171
11841172 /* Netdev related settings */
11851173 unsigned char mac_addr[ETH_ALEN];
....@@ -1266,6 +1254,7 @@
12661254 unsigned int parallel_detect;
12671255 unsigned int fec_ability;
12681256 unsigned long an_start;
1257
+ unsigned long kr_start_time;
12691258 enum xgbe_an_mode an_mode;
12701259
12711260 /* I2C support */
....@@ -1322,6 +1311,7 @@
13221311 void xgbe_init_function_ptrs_i2c(struct xgbe_i2c_if *);
13231312 const struct net_device_ops *xgbe_get_netdev_ops(void);
13241313 const struct ethtool_ops *xgbe_get_ethtool_ops(void);
1314
+const struct udp_tunnel_nic_info *xgbe_get_udp_tunnel_info(void);
13251315
13261316 #ifdef CONFIG_AMD_XGBE_DCB
13271317 const struct dcbnl_rtnl_ops *xgbe_get_dcbnl_ops(void);