Commit 0d478943 authored by Nishka Dasgupta's avatar Nishka Dasgupta Committed by Greg Kroah-Hartman

staging: rtl8712: make_wlanhdr(): Change return values and type

Change return values of make_wlanhdr from _SUCCESS/_FAIL to 0/-EINVAL.
Modify call site to check for non-zero return values instead of _FAIL.
Change return type from sint to int.
Signed-off-by: default avatarNishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190809052353.5308-4-nishkadg.linux@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b013c5b8
...@@ -469,8 +469,8 @@ static sint xmitframe_swencrypt(struct _adapter *padapter, ...@@ -469,8 +469,8 @@ static sint xmitframe_swencrypt(struct _adapter *padapter,
return _SUCCESS; return _SUCCESS;
} }
static sint make_wlanhdr(struct _adapter *padapter, u8 *hdr, static int make_wlanhdr(struct _adapter *padapter, u8 *hdr,
struct pkt_attrib *pattrib) struct pkt_attrib *pattrib)
{ {
u16 *qc; u16 *qc;
...@@ -509,7 +509,7 @@ static sint make_wlanhdr(struct _adapter *padapter, u8 *hdr, ...@@ -509,7 +509,7 @@ static sint make_wlanhdr(struct _adapter *padapter, u8 *hdr,
memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv),
ETH_ALEN); ETH_ALEN);
} else { } else {
return _FAIL; return -EINVAL;
} }
if (pattrib->encrypt) if (pattrib->encrypt)
...@@ -547,7 +547,7 @@ static sint make_wlanhdr(struct _adapter *padapter, u8 *hdr, ...@@ -547,7 +547,7 @@ static sint make_wlanhdr(struct _adapter *padapter, u8 *hdr,
} }
} }
} }
return _SUCCESS; return 0;
} }
static sint r8712_put_snap(u8 *data, u16 h_proto) static sint r8712_put_snap(u8 *data, u16 h_proto)
...@@ -605,7 +605,7 @@ sint r8712_xmitframe_coalesce(struct _adapter *padapter, _pkt *pkt, ...@@ -605,7 +605,7 @@ sint r8712_xmitframe_coalesce(struct _adapter *padapter, _pkt *pkt,
pbuf_start = pxmitframe->buf_addr; pbuf_start = pxmitframe->buf_addr;
ptxdesc = pbuf_start; ptxdesc = pbuf_start;
mem_start = pbuf_start + TXDESC_OFFSET; mem_start = pbuf_start + TXDESC_OFFSET;
if (make_wlanhdr(padapter, mem_start, pattrib) == _FAIL) if (make_wlanhdr(padapter, mem_start, pattrib))
return _FAIL; return _FAIL;
_r8712_open_pktfile(pkt, &pktfile); _r8712_open_pktfile(pkt, &pktfile);
_r8712_pktfile_read(&pktfile, NULL, (uint) pattrib->pkt_hdrlen); _r8712_pktfile_read(&pktfile, NULL, (uint) pattrib->pkt_hdrlen);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment