Commit 0cc22290 authored Jul 31, 2015 by Subash Abhinov Kasiviswanathan

Merge remote-tracking branch 'tmp-4ce2cf70' into master



This merge brings us up to date with msm-3.10 as of commit 80ce3788
("msm_rmnet_bam: Add support for IOCTL RMNET_IOCTL_DEREGISTER_DEV").
This is the port of the msm_rmnet_bam driver.

* tmp-4ce2cf70:
  msm_rmnet_bam: Add support for IOCTL RMNET_IOCTL_DEREGISTER_DEV
  msm_rmnet_bam: Use the correct netif_rx api
  msm_rmnet_bam: Do not grab non-RMNET BAM channels
  msm_bam_rmnet: Add support for MAP packets
  msm_bam_rmnet: Implement extended IOCTL's
  msm_bam_rmnet: Use Probe Method for Enumerating BAM
  msm_bam_rmnet: Fix potential memory corruption
  net: rmnet_data: new structure for rmnet ioctls
  msm: bam_dmux: Support multiplatform
  msm_bam_rmnet: Fix packet corruption due to QoS
  msm_bam_rmnet: Check for sufficient headroom
  msm: rmnet: fix open failure due to duplicate platform driver open
  msm: rmnet: Add platform device validation
  msm: rmnet: Add support for tethered USB channel
  rmnet_bam: Free netdevice resources if init fails
  msm: rmnet: Add new rmnet ports for iWLAN feature
  msm_rmnet: add ioctl to enable/disable flow on prio qdisc
  msm: bam_dmux: initial version of BAM Data Mux driver

Change-Id: I60652c031d23af159c2ba25e2532a3c412232c2c
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>

parents d62a9cbf 4ce2cf70

drivers/net/ethernet/msm/Kconfig

+15 −0

Original line number	Diff line number	Diff line
		@@ -26,3 +26,18 @@ config RNDIS_IPA
		This Network interface is aimed to allow data path go through
		IPA core while using RNDIS protocol.

		config MSM_RMNET_BAM
		bool "RMNET BAM Driver"
		depends on MSM_BAM_DMUX
		default n
		help
		Implements RMNET over BAM interface.
		RMNET provides a virtual ethernet interface
		for routing IP packets within the MSM using
		BAM as a physical transport.

		config MSM_RMNET_DEBUG
		bool "MSM RMNET debug interface"
		depends on MSM_RMNET
		default n

drivers/net/ethernet/msm/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -5,3 +5,4 @@
		obj-$(CONFIG_MSM_RMNET_MHI) += msm_rmnet_mhi.o
		obj-$(CONFIG_ECM_IPA) += ecm_ipa.o
		obj-$(CONFIG_RNDIS_IPA) += rndis_ipa.o
		obj-$(CONFIG_MSM_RMNET_BAM) += msm_rmnet_bam.o

drivers/net/ethernet/msm/msm_rmnet_bam.c

0 → 100644

+925 −0

File added.

Preview size limit exceeded, changes collapsed.