port-qmi: net ports using IPA driver expect rmnet based multiplexing

When using the IPA driver we cannot blindly use the master network
interface, we must always use RMNET based multiplexing.
This commit is contained in:
Aleksander Morgado
2021-03-17 15:13:41 +01:00
parent bf519fcc1b
commit c35bf66678

View File

@@ -1009,6 +1009,10 @@ load_current_kernel_data_modes (MMPortQmi *self,
if (g_strcmp0 (self->priv->net_driver, "bam-dmux") == 0) if (g_strcmp0 (self->priv->net_driver, "bam-dmux") == 0)
return MM_PORT_QMI_KERNEL_DATA_MODE_RAW_IP; return MM_PORT_QMI_KERNEL_DATA_MODE_RAW_IP;
/* For IPA based setups, always rmnet multiplexing */
if (g_strcmp0 (self->priv->net_driver, "ipa") == 0)
return MM_PORT_QMI_KERNEL_DATA_MODE_MUX_RMNET;
/* For USB based setups, query kernel */ /* For USB based setups, query kernel */
if (g_strcmp0 (self->priv->net_driver, "qmi_wwan") == 0) { if (g_strcmp0 (self->priv->net_driver, "qmi_wwan") == 0) {
switch (qmi_device_get_expected_data_format (device, NULL)) { switch (qmi_device_get_expected_data_format (device, NULL)) {
@@ -1041,6 +1045,10 @@ load_supported_kernel_data_modes (MMPortQmi *self,
if (g_strcmp0 (self->priv->net_driver, "bam-dmux") == 0) if (g_strcmp0 (self->priv->net_driver, "bam-dmux") == 0)
return MM_PORT_QMI_KERNEL_DATA_MODE_RAW_IP; return MM_PORT_QMI_KERNEL_DATA_MODE_RAW_IP;
/* For IPA based setups, always rmnet multiplexing */
if (g_strcmp0 (self->priv->net_driver, "ipa") == 0)
return MM_PORT_QMI_KERNEL_DATA_MODE_MUX_RMNET;
/* For USB based setups, we may have all supported */ /* For USB based setups, we may have all supported */
if (g_strcmp0 (self->priv->net_driver, "qmi_wwan") == 0) { if (g_strcmp0 (self->priv->net_driver, "qmi_wwan") == 0) {
MMPortQmiKernelDataMode supported = MM_PORT_QMI_KERNEL_DATA_MODE_802_3; MMPortQmiKernelDataMode supported = MM_PORT_QMI_KERNEL_DATA_MODE_802_3;