.. | .. |
---|
135 | 135 | #include <linux/list.h> |
---|
136 | 136 | |
---|
137 | 137 | #define XGBE_DRV_NAME "amd-xgbe" |
---|
138 | | -#define XGBE_DRV_VERSION "1.0.3" |
---|
139 | 138 | #define XGBE_DRV_DESC "AMD 10 Gigabit Ethernet Driver" |
---|
140 | 139 | |
---|
141 | 140 | /* Descriptor related defines */ |
---|
.. | .. |
---|
290 | 289 | /* Auto-negotiation */ |
---|
291 | 290 | #define XGBE_AN_MS_TIMEOUT 500 |
---|
292 | 291 | #define XGBE_LINK_TIMEOUT 5 |
---|
| 292 | +#define XGBE_KR_TRAINING_WAIT_ITER 50 |
---|
293 | 293 | |
---|
294 | 294 | #define XGBE_SGMII_AN_LINK_STATUS BIT(1) |
---|
295 | 295 | #define XGBE_SGMII_AN_LINK_SPEED (BIT(2) | BIT(3)) |
---|
.. | .. |
---|
1015 | 1015 | unsigned int an_cdr_workaround; |
---|
1016 | 1016 | }; |
---|
1017 | 1017 | |
---|
1018 | | -struct xgbe_vxlan_data { |
---|
1019 | | - struct list_head list; |
---|
1020 | | - sa_family_t sa_family; |
---|
1021 | | - __be16 port; |
---|
1022 | | -}; |
---|
1023 | | - |
---|
1024 | 1018 | struct xgbe_prv_data { |
---|
1025 | 1019 | struct net_device *netdev; |
---|
1026 | 1020 | struct pci_dev *pcidev; |
---|
.. | .. |
---|
1173 | 1167 | u32 rss_options; |
---|
1174 | 1168 | |
---|
1175 | 1169 | /* 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; |
---|
1181 | 1170 | u16 vxlan_port; |
---|
1182 | | - netdev_features_t vxlan_features; |
---|
1183 | 1171 | |
---|
1184 | 1172 | /* Netdev related settings */ |
---|
1185 | 1173 | unsigned char mac_addr[ETH_ALEN]; |
---|
.. | .. |
---|
1266 | 1254 | unsigned int parallel_detect; |
---|
1267 | 1255 | unsigned int fec_ability; |
---|
1268 | 1256 | unsigned long an_start; |
---|
| 1257 | + unsigned long kr_start_time; |
---|
1269 | 1258 | enum xgbe_an_mode an_mode; |
---|
1270 | 1259 | |
---|
1271 | 1260 | /* I2C support */ |
---|
.. | .. |
---|
1322 | 1311 | void xgbe_init_function_ptrs_i2c(struct xgbe_i2c_if *); |
---|
1323 | 1312 | const struct net_device_ops *xgbe_get_netdev_ops(void); |
---|
1324 | 1313 | const struct ethtool_ops *xgbe_get_ethtool_ops(void); |
---|
| 1314 | +const struct udp_tunnel_nic_info *xgbe_get_udp_tunnel_info(void); |
---|
1325 | 1315 | |
---|
1326 | 1316 | #ifdef CONFIG_AMD_XGBE_DCB |
---|
1327 | 1317 | const struct dcbnl_rtnl_ops *xgbe_get_dcbnl_ops(void); |
---|