summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorSubash Abhinov Kasiviswanathan <subashab@codeaurora.org>2015-09-02 14:18:46 -0600
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-22 11:05:43 -0700
commitece90739ece2746a30a5eb4998c5949cd1c4f68d (patch)
tree6f70140146b5d7037a248648f3c1104a4134506e /net
parent2b455e304e1ebdd8882632feb4d2f242c278dd12 (diff)
net: rmnet_data: Assign network_header instead of data in mac_header
Commit 1a37e412a0225fc ("net: Use 16bits for *_headers fields of struct skbuff") changes the data type of mac_header from pointer to __u16. As a result, it is invalid to assign data to mac_header in architectures where NET_SKBUFF_DATA_USES_OFFSET is 0. Change-Id: I97ce04e3747983839d3908ca8111fd588c8e43a2 Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Diffstat (limited to 'net')
-rw-r--r--net/rmnet_data/rmnet_data_handlers.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rmnet_data/rmnet_data_handlers.c b/net/rmnet_data/rmnet_data_handlers.c
index 484060e6a5bf..c80090bee963 100644
--- a/net/rmnet_data/rmnet_data_handlers.c
+++ b/net/rmnet_data/rmnet_data_handlers.c
@@ -180,7 +180,7 @@ static void rmnet_reset_mac_header(struct sk_buff *skb)
#else
static void rmnet_reset_mac_header(struct sk_buff *skb)
{
- skb->mac_header = skb->data;
+ skb->mac_header = skb->network_header;
skb->mac_len = 0;
}
#endif /*NET_SKBUFF_DATA_USES_OFFSET*/