From 4f3f01b12283ecd59a2146b2bb8b5385688ed9bd Mon Sep 17 00:00:00 2001 From: Alan Chen Date: Wed, 20 Nov 2019 17:12:24 -0800 Subject: [PATCH] qcacmn: Replace skb_frag_struct pointer with skb_frag_t skb_frag_t typedef was modified in kernel version 5.4. Change code to use the typedef rather than the underlying type so that the same code will be built on both 5.4 and pre-5.4 kernels. Change-Id: Id491ab5edf0dec7cd09426d6c6b0a607ff66b66f CRs-Fixed: 2559037 --- qdf/linux/src/qdf_nbuf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qdf/linux/src/qdf_nbuf.c b/qdf/linux/src/qdf_nbuf.c index 7feb537e5630..7443c69633af 100644 --- a/qdf/linux/src/qdf_nbuf.c +++ b/qdf/linux/src/qdf_nbuf.c @@ -2883,7 +2883,7 @@ uint32_t __qdf_nbuf_get_tso_info(qdf_device_t osdev, struct sk_buff *skb, uint32_t num_seg = 0; struct qdf_tso_seg_elem_t *curr_seg; struct qdf_tso_num_seg_elem_t *total_num_seg; - struct skb_frag_struct *frag = NULL; + skb_frag_t *frag = NULL; uint32_t tso_frag_len = 0; /* tso segment's fragment length*/ uint32_t skb_frag_len = 0; /* skb's fragment length (contiguous memory)*/ uint32_t skb_proc = skb->len; /* bytes of skb pending processing */ @@ -3174,7 +3174,7 @@ uint32_t __qdf_nbuf_get_tso_num_seg(struct sk_buff *skb) uint32_t skb_frag_len = 0; uint32_t eit_hdr_len = (skb_transport_header(skb) - skb_mac_header(skb)) + tcp_hdrlen(skb); - struct skb_frag_struct *frag = NULL; + skb_frag_t *frag = NULL; int j = 0; uint32_t temp_num_seg = 0; @@ -3260,7 +3260,7 @@ uint32_t __qdf_nbuf_get_tso_num_seg(struct sk_buff *skb) uint32_t __qdf_nbuf_get_tso_num_seg(struct sk_buff *skb) { uint32_t i, gso_size, tmp_len, num_segs = 0; - struct skb_frag_struct *frag = NULL; + skb_frag_t *frag = NULL; /* * Check if the head SKB or any of frags are allocated in < 0x50000000 @@ -3312,7 +3312,7 @@ fail: uint32_t __qdf_nbuf_get_tso_num_seg(struct sk_buff *skb) { uint32_t i, gso_size, tmp_len, num_segs = 0; - struct skb_frag_struct *frag = NULL; + skb_frag_t *frag = NULL; for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { frag = &skb_shinfo(skb)->frags[i];