lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 831/846] net: wwan: Fix MRU mismatch issue which may lead to data connection lost
    Date
    From: Slark Xiao <slark_xiao@163.com>

    commit f542cdfa3083a309e3caafbbdf41490c4935492a upstream.

    In pci_generic.c there is a 'mru_default' in struct mhi_pci_dev_info.
    This value shall be used for whole mhi if it's given a value for a specific product.
    But in function mhi_net_rx_refill_work(), it's still using hard code value MHI_DEFAULT_MRU.
    'mru_default' shall have higher priority than MHI_DEFAULT_MRU.
    And after checking, this change could help fix a data connection lost issue.

    Fixes: 5c2c85315948 ("bus: mhi: pci-generic: configurable network interface MRU")
    Signed-off-by: Shujun Wang <wsj20369@163.com>
    Signed-off-by: Slark Xiao <slark_xiao@163.com>
    Reviewed-by: Loic Poulain <loic.poulain@linaro.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/wwan/mhi_wwan_mbim.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/wwan/mhi_wwan_mbim.c b/drivers/net/wwan/mhi_wwan_mbim.c
    index 71bf9b4f769f..6872782e8dd8 100644
    --- a/drivers/net/wwan/mhi_wwan_mbim.c
    +++ b/drivers/net/wwan/mhi_wwan_mbim.c
    @@ -385,13 +385,13 @@ static void mhi_net_rx_refill_work(struct work_struct *work)
    int err;

    while (!mhi_queue_is_full(mdev, DMA_FROM_DEVICE)) {
    - struct sk_buff *skb = alloc_skb(MHI_DEFAULT_MRU, GFP_KERNEL);
    + struct sk_buff *skb = alloc_skb(mbim->mru, GFP_KERNEL);

    if (unlikely(!skb))
    break;

    err = mhi_queue_skb(mdev, DMA_FROM_DEVICE, skb,
    - MHI_DEFAULT_MRU, MHI_EOT);
    + mbim->mru, MHI_EOT);
    if (unlikely(err)) {
    kfree_skb(skb);
    break;
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-25 01:20    [W:4.029 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site