summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorSubash Abhinov Kasiviswanathan <subashab@codeaurora.org>2016-04-12 20:16:32 -0600
committerKyle Yan <kyan@codeaurora.org>2016-04-28 16:47:48 -0700
commit8cfd4a1557b4caa69d36099c3d204085dd7c1fed (patch)
treed32abda05382b8abe750d2b505c89fb4d7078190 /net
parent28e988cc2ffac301f8270ef50de268b4b4c44e93 (diff)
net: rmnet_data: Stop adding pad bytes for MAPv3 uplink packets
Hardware does not require pad bytes in egress packets when uplink aggregation is not enabled. CRs-Fixed: 1002396 Change-Id: I86459b7bc18da16b66f6c701ac324f28be8848fa Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Diffstat (limited to 'net')
-rw-r--r--net/rmnet_data/rmnet_data_handlers.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/rmnet_data/rmnet_data_handlers.c b/net/rmnet_data/rmnet_data_handlers.c
index 6c40f229d5d6..9d04b2f8ddd9 100644
--- a/net/rmnet_data/rmnet_data_handlers.c
+++ b/net/rmnet_data/rmnet_data_handlers.c
@@ -516,10 +516,8 @@ static int rmnet_map_egress_handler(struct sk_buff *skb,
rmnet_stats_ul_checksum(ckresult);
}
- if (((config->egress_data_format &
- RMNET_EGRESS_FORMAT_MAP_CKSUMV4) &&
- (!(config->egress_data_format &
- RMNET_EGRESS_FORMAT_AGGREGATION))) ||
+ if ((!(config->egress_data_format &
+ RMNET_EGRESS_FORMAT_AGGREGATION)) ||
((orig_dev->features & NETIF_F_GSO) && skb_is_nonlinear(skb)))
map_header = rmnet_map_add_map_header
(skb, additional_header_length, RMNET_MAP_NO_PAD_BYTES);