X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fdevice%2Finit.c;h=76d122d37d5184602a91fd09ec728a81dd12fc2a;hb=fe7d4a2e31529eed5416b38b520fdc84687df03c;hp=d719d4b71532a4132d1c66986be5e5974fbdd041;hpb=fa957142beae75e4cf881f7e861cefd97f034a83;p=vpp.git

diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c
index d719d4b7153..76d122d37d5 100755
--- a/src/plugins/dpdk/device/init.c
+++ b/src/plugins/dpdk/device/init.c
@@ -62,14 +62,22 @@ port_type_from_speed_capa (struct rte_eth_dev_info *dev_info)
 
   if (dev_info->speed_capa & ETH_LINK_SPEED_100G)
     return VNET_DPDK_PORT_TYPE_ETH_100G;
+  else if (dev_info->speed_capa & ETH_LINK_SPEED_56G)
+    return VNET_DPDK_PORT_TYPE_ETH_56G;
   else if (dev_info->speed_capa & ETH_LINK_SPEED_50G)
     return VNET_DPDK_PORT_TYPE_ETH_50G;
   else if (dev_info->speed_capa & ETH_LINK_SPEED_40G)
     return VNET_DPDK_PORT_TYPE_ETH_40G;
   else if (dev_info->speed_capa & ETH_LINK_SPEED_25G)
     return VNET_DPDK_PORT_TYPE_ETH_25G;
+  else if (dev_info->speed_capa & ETH_LINK_SPEED_20G)
+    return VNET_DPDK_PORT_TYPE_ETH_20G;
   else if (dev_info->speed_capa & ETH_LINK_SPEED_10G)
     return VNET_DPDK_PORT_TYPE_ETH_10G;
+  else if (dev_info->speed_capa & ETH_LINK_SPEED_5G)
+    return VNET_DPDK_PORT_TYPE_ETH_5G;
+  else if (dev_info->speed_capa & ETH_LINK_SPEED_2_5G)
+    return VNET_DPDK_PORT_TYPE_ETH_2_5G;
   else if (dev_info->speed_capa & ETH_LINK_SPEED_1G)
     return VNET_DPDK_PORT_TYPE_ETH_1G;
 
@@ -408,6 +416,7 @@ dpdk_lib_init (dpdk_main_t * dm)
 
 	    case VNET_DPDK_PMD_ENA:
 	      xd->port_type = VNET_DPDK_PORT_TYPE_ETH_VF;
+	      xd->port_conf.rxmode.enable_scatter = 0;
 	      break;
 
 	    case VNET_DPDK_PMD_DPAA2:
@@ -687,8 +696,11 @@ dpdk_lib_init (dpdk_main_t * dm)
 	    clib_warning ("VLAN strip cannot be supported by interface\n");
 	}
 
-      hi->max_l3_packet_bytes[VLIB_RX] = hi->max_l3_packet_bytes[VLIB_TX] =
-	xd->port_conf.rxmode.max_rx_pkt_len - sizeof (ethernet_header_t);
+      if (hi)
+	hi->max_l3_packet_bytes[VLIB_RX] = hi->max_l3_packet_bytes[VLIB_TX] =
+	  xd->port_conf.rxmode.max_rx_pkt_len - sizeof (ethernet_header_t);
+      else
+	clib_warning ("hi NULL");
 
       rte_eth_dev_set_mtu (xd->device_index, mtu);
     }
@@ -1386,12 +1398,33 @@ dpdk_update_link_state (dpdk_device_t * xd, f64 now)
 	case ETH_SPEED_NUM_1G:
 	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_1G;
 	  break;
+	case ETH_SPEED_NUM_2_5G:
+	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_2_5G;
+	  break;
+	case ETH_SPEED_NUM_5G:
+	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_5G;
+	  break;
 	case ETH_SPEED_NUM_10G:
 	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_10G;
 	  break;
+	case ETH_SPEED_NUM_20G:
+	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_20G;
+	  break;
+	case ETH_SPEED_NUM_25G:
+	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_25G;
+	  break;
 	case ETH_SPEED_NUM_40G:
 	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_40G;
 	  break;
+	case ETH_SPEED_NUM_50G:
+	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_50G;
+	  break;
+	case ETH_SPEED_NUM_56G:
+	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_56G;
+	  break;
+	case ETH_SPEED_NUM_100G:
+	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_100G;
+	  break;
 	case 0:
 	  break;
 	default: