Skip to content

Commit

Permalink
Merge branch 'mhi-mbim'
Browse files Browse the repository at this point in the history
Loic Poulain says:

====================
net: mhi: move MBIM to WWAN

Implement a proper WWAN driver for MBIM network protocol, with multi link
management supported through the WWAN framework (wwan rtnetlink).

Until now, MBIM over MHI was supported directly in the mhi_net driver, via
some protocol rx/tx fixup callbacks, but with only one session supported
(no multilink muxing). We can then remove that part from mhi_net and restore
the driver to a simpler version for 'raw' ip transfer (or QMAP via rmnet link).

Note that a wwan0 link is created by default for session-id 0. Additional links
can be managed via ip tool:

    $ ip link add dev wwan0mms parentdev wwan0 type wwan linkid 1
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Aug 4, 2021
2 parents 8730379 + 7ffa754 commit 93bbcfe
Show file tree
Hide file tree
Showing 9 changed files with 720 additions and 475 deletions.
4 changes: 2 additions & 2 deletions drivers/net/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -431,10 +431,10 @@ config VSOCKMON
config MHI_NET
tristate "MHI network driver"
depends on MHI_BUS
select WWAN
help
This is the network driver for MHI bus. It can be used with
QCOM based WWAN modems (like SDX55). Say Y or M.
QCOM based WWAN modems for IP or QMAP/rmnet protocol (like SDX55).
Say Y or M.

endif # NET_CORE

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ obj-$(CONFIG_GTP) += gtp.o
obj-$(CONFIG_NLMON) += nlmon.o
obj-$(CONFIG_NET_VRF) += vrf.o
obj-$(CONFIG_VSOCKMON) += vsockmon.o
obj-$(CONFIG_MHI_NET) += mhi/
obj-$(CONFIG_MHI_NET) += mhi_net.o

#
# Networking Drivers
Expand Down
3 changes: 0 additions & 3 deletions drivers/net/mhi/Makefile

This file was deleted.

41 changes: 0 additions & 41 deletions drivers/net/mhi/mhi.h

This file was deleted.

310 changes: 0 additions & 310 deletions drivers/net/mhi/proto_mbim.c

This file was deleted.

Loading

0 comments on commit 93bbcfe

Please sign in to comment.