Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cc22290 authored by Subash Abhinov Kasiviswanathan's avatar Subash Abhinov Kasiviswanathan
Browse files

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: default avatarSubash Abhinov Kasiviswanathan <subashab@codeaurora.org>
parents d62a9cbf 4ce2cf70
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment