summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSujeev Dias <sdias@codeaurora.org>2016-10-27 15:23:37 -0700
committerSujeev Dias <sdias@codeaurora.org>2017-03-11 13:47:06 -0800
commit8ac488be9e91d0d19cdf9c796b6fc9156699a07b (patch)
tree724fb978bd217194da1c1b28d48b2e84707b732c
parent3d0bc07b5bafd75e34336e8b1acc50fa846df23c (diff)
msm: mhi_rmnet: remove headroom reservation
MHI_RMNET layer not required to reserve for IP headroom data since rmnet_data layer will create a new skb if headroom reservation is needed. CRs-Fixed: 1085031 Change-Id: Ic04e73510140e6c00ee18107a8edc9ead0b53863 Signed-off-by: Sujeev Dias <sdias@codeaurora.org>
-rw-r--r--drivers/net/ethernet/msm/msm_rmnet_mhi.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/ethernet/msm/msm_rmnet_mhi.c b/drivers/net/ethernet/msm/msm_rmnet_mhi.c
index b5c75349df3c..1fbedea6093e 100644
--- a/drivers/net/ethernet/msm/msm_rmnet_mhi.c
+++ b/drivers/net/ethernet/msm/msm_rmnet_mhi.c
@@ -34,7 +34,6 @@
#define MHI_DEFAULT_MTU 8000
#define MHI_MAX_MRU 0xFFFF
#define MHI_NAPI_WEIGHT_VALUE 12
-#define MHI_RX_HEADROOM 64
#define WATCHDOG_TIMEOUT (30 * HZ)
#define RMNET_IPC_LOG_PAGES (100)
@@ -120,9 +119,9 @@ static int rmnet_mhi_process_fragment(struct rmnet_mhi_private *rmnet_mhi_ptr,
if (rmnet_mhi_ptr->frag_skb) {
/* Merge the new skb into the old fragment */
temp_skb = skb_copy_expand(rmnet_mhi_ptr->frag_skb,
- MHI_RX_HEADROOM,
- skb->len,
- GFP_ATOMIC);
+ 0,
+ skb->len,
+ GFP_ATOMIC);
if (!temp_skb) {
kfree(rmnet_mhi_ptr->frag_skb);
rmnet_mhi_ptr->frag_skb = NULL;
@@ -209,9 +208,8 @@ static int rmnet_alloc_rx(struct rmnet_mhi_private *rmnet_mhi_ptr,
return -ENOMEM;
}
skb_priv = (struct mhi_skb_priv *)(skb->cb);
- skb_priv->dma_size = cur_mru - MHI_RX_HEADROOM;
+ skb_priv->dma_size = cur_mru;
skb_priv->dma_addr = 0;
- skb_reserve(skb, MHI_RX_HEADROOM);
/* These steps must be in atomic context */
spin_lock_irqsave(&rmnet_mhi_ptr->alloc_lock, flags);