net: mhi: Improve MBIM packet counting

Packets are aggregated over the MBIM link and currently the MHI net
device will count each aggregated packet rather then the actual
packets themselves.

If a protocol handler module is specified, use that to count the
packets rather than directly in the MHI net device. This is in line
with the behaviour of the USB net cdc_mbim driver.

Signed-off-by: Richard Laing <richard.laing@alliedtelesis.co.nz>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/mhi/net.c b/drivers/net/mhi/net.c
index a5a2aa19bb91809c5649b0e39754d503e11a7753..0cc7dcd0ff96cf4de17547ca03bdd749505af906 100644 (file)
--- a/drivers/net/mhi/net.c
+++ b/drivers/net/mhi/net.c
@@ -205,11 +205,6 @@ static void mhi_net_dl_callback(struct mhi_device *mhi_dev,
                        mhi_netdev->skbagg_head = NULL;
                }
 
-               u64_stats_update_begin(&mhi_netdev->stats.rx_syncp);
-               u64_stats_inc(&mhi_netdev->stats.rx_packets);
-               u64_stats_add(&mhi_netdev->stats.rx_bytes, skb->len);
-               u64_stats_update_end(&mhi_netdev->stats.rx_syncp);
-
                switch (skb->data[0] & 0xf0) {
                case 0x40:
                        skb->protocol = htons(ETH_P_IP);
@@ -222,10 +217,15 @@ static void mhi_net_dl_callback(struct mhi_device *mhi_dev,
                        break;
                }
 
-               if (proto && proto->rx)
+               if (proto && proto->rx) {
                        proto->rx(mhi_netdev, skb);
-               else
+               } else {
+                       u64_stats_update_begin(&mhi_netdev->stats.rx_syncp);
+                       u64_stats_inc(&mhi_netdev->stats.rx_packets);
+                       u64_stats_add(&mhi_netdev->stats.rx_bytes, skb->len);
+                       u64_stats_update_end(&mhi_netdev->stats.rx_syncp);
                        netif_rx(skb);
+               }
        }
 
        /* Refill if RX buffers queue becomes low */

diff --git a/drivers/net/mhi/proto_mbim.c b/drivers/net/mhi/proto_mbim.c
index f1cc7f35bb85898818809316a15f30be242c3c5e..761d90b28ee625b3cc4791db46cf42baeb573ed2 100644 (file)
--- a/drivers/net/mhi/proto_mbim.c
+++ b/drivers/net/mhi/proto_mbim.c
@@ -211,6 +211,10 @@ static void mbim_rx(struct mhi_net_dev *mhi_netdev, struct sk_buff *skb)
                                continue;
                        }
 
+                       u64_stats_update_begin(&mhi_netdev->stats.rx_syncp);
+                       u64_stats_inc(&mhi_netdev->stats.rx_packets);
+                       u64_stats_add(&mhi_netdev->stats.rx_bytes, skbn->len);
+                       u64_stats_update_end(&mhi_netdev->stats.rx_syncp);
                        netif_rx(skbn);
                }
 next_ndp: