diff options
| author | Loic Poulain <loic.poulain@linaro.org> | 2020-12-29 10:04:54 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-01-06 00:37:29 +0100 |
| commit | c134db89a44bdc86c7b0451095d6ba328a7c1748 (patch) | |
| tree | 8b53638fe7ceb84f7d13675aa88f094ba609230c /drivers/net/mhi_net.c | |
| parent | Merge branch 'enetc-code-cleanups' (diff) | |
| download | linux-c134db89a44bdc86c7b0451095d6ba328a7c1748.tar.xz linux-c134db89a44bdc86c7b0451095d6ba328a7c1748.zip | |
net: mhi: Add raw IP mode support
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/mhi_net.c')
| -rw-r--r-- | drivers/net/mhi_net.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/net/mhi_net.c b/drivers/net/mhi_net.c index fa41d8c42f05..5f3a4cc92a88 100644 --- a/drivers/net/mhi_net.c +++ b/drivers/net/mhi_net.c @@ -122,7 +122,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; @@ -158,7 +158,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); } |