diff mbox series

[net-next,v3] net: mhi: Add raw IP mode support

Message ID 1609232694-10858-1-git-send-email-loic.poulain@linaro.org
State New
Headers show
Series [net-next,v3] net: mhi: Add raw IP mode support | expand

Commit Message

Loic Poulain Dec. 29, 2020, 9:04 a.m. UTC 
MHI net is protocol agnostic, the payload protocol depends on the modem
configuration, which can be either RMNET (IP muxing and aggregation) or
raw IP. This patch adds support for incomming IPv4/IPv6 packets, that
was previously unconditionnaly reported as RMNET packets.

Signed-off-by: Loic Poulain <loic.poulain@linaro.org>

---
 drivers/net/mhi_net.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

-- 
2.7.4

Comments

David Miller Jan. 5, 2021, 11:41 p.m. UTC | #1 
From: Loic Poulain <loic.poulain@linaro.org>

Date: Tue, 29 Dec 2020 10:04:54 +0100

> MHI net is protocol agnostic, the payload protocol depends on the modem

> configuration, which can be either RMNET (IP muxing and aggregation) or

> raw IP. This patch adds support for incomming IPv4/IPv6 packets, that

> was previously unconditionnaly reported as RMNET packets.

> 

> Signed-off-by: Loic Poulain <loic.poulain@linaro.org>



Applied to net-next, thanks.
diff mbox series

Patch

diff --git a/drivers/net/mhi_net.c b/drivers/net/mhi_net.c
index e3f9c0d..478e78f 100644
--- a/drivers/net/mhi_net.c
+++ b/drivers/net/mhi_net.c
@@ -121,7 +121,7 @@  static const struct net_device_ops mhi_netdev_ops = {
 static void mhi_net_setup(struct net_device *ndev)
 {
 	ndev->header_ops = NULL;  /* No header */
-	ndev->type = ARPHRD_NONE; /* QMAP... */
+	ndev->type = ARPHRD_RAWIP;
 	ndev->hard_header_len = 0;
 	ndev->addr_len = 0;
 	ndev->flags = IFF_POINTOPOINT | IFF_NOARP;
@@ -157,7 +157,18 @@  static void mhi_net_dl_callback(struct mhi_device *mhi_dev,
 		u64_stats_add(&mhi_netdev->stats.rx_bytes, mhi_res->bytes_xferd);
 		u64_stats_update_end(&mhi_netdev->stats.rx_syncp);
 
-		skb->protocol = htons(ETH_P_MAP);
+		switch (skb->data[0] & 0xf0) {
+		case 0x40:
+			skb->protocol = htons(ETH_P_IP);
+			break;
+		case 0x60:
+			skb->protocol = htons(ETH_P_IPV6);
+			break;
+		default:
+			skb->protocol = htons(ETH_P_MAP);
+			break;
+		}
+
 		skb_put(skb, mhi_res->bytes_xferd);
 		netif_rx(skb);
 	}