Skip to content

Commit

Permalink
rtl8192du: Fix various items
Browse files Browse the repository at this point in the history
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
  • Loading branch information
lwfinger committed Aug 9, 2014
1 parent 69d04e1 commit a2deb84
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 40 deletions.
2 changes: 1 addition & 1 deletion hal/hal_intf.c
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ void rtw_hal_antdiv_rssi_compared(struct rtw_adapter *padapter, WLAN_BSSID_EX *d
#endif

#ifdef CONFIG_HOSTAPD_MLME
s32 rtw_hal_hostap_mgnt_xmit_entry(struct rtw_adapter *padapter, _pkt *pkt)
s32 rtw_hal_hostap_mgnt_xmit_entry(struct rtw_adapter *padapter, struct sk_buff *pkt)
{
if (padapter->HalFunc.hostap_mgnt_xmit_entry)
return padapter->HalFunc.hostap_mgnt_xmit_entry(padapter, pkt);
Expand Down
6 changes: 3 additions & 3 deletions hal/rtl8192du_xmit.c
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,7 @@ static void rtl8192du_hostap_mgnt_xmit_cb(struct urb *urb)
dev_kfree_skb_any(skb);
}

s32 rtl8192du_hostap_mgnt_xmit_entry(struct rtw_adapter *padapter, _pkt *pkt)
s32 rtl8192du_hostap_mgnt_xmit_entry(struct rtw_adapter *padapter, struct sk_buff *pkt)
{
u16 fc;
int rc, len, pipe;
Expand Down Expand Up @@ -922,7 +922,7 @@ s32 rtl8192du_hostap_mgnt_xmit_entry(struct rtw_adapter *padapter, _pkt *pkt)
ptxdesc->txdw4 |= cpu_to_le32(BIT(7)); /* Hw set sequence number */
ptxdesc->txdw3 |= cpu_to_le32((8 <<28)); /* set bit3 to 1. Suugested by TimChen. 2009.12.29. */

rtl8192cu_cal_txdesc_chksum(ptxdesc);
rtl8192du_cal_txdesc_chksum(ptxdesc);
/* ----- end of fill tx desc ----- */

/* */
Expand All @@ -935,7 +935,7 @@ s32 rtl8192du_hostap_mgnt_xmit_entry(struct rtw_adapter *padapter, _pkt *pkt)
/* translate DMA FIFO addr to pipehandle */
pipe = usb_sndbulkpipe(pdvobj->pusbdev, pHalData->Queue2EPNum[(u8)MGT_QUEUE_INX]&0x0f);
usb_fill_bulk_urb(urb, pdvobj->pusbdev, pipe,
pxmit_skb->data, pxmit_skb->len, rtl8192cu_hostap_mgnt_xmit_cb, pxmit_skb);
pxmit_skb->data, pxmit_skb->len, rtl8192du_hostap_mgnt_xmit_cb, pxmit_skb);

urb->transfer_flags |= URB_ZERO_PACKET;
usb_anchor_urb(urb, &phostapdpriv->anchored);
Expand Down
2 changes: 1 addition & 1 deletion include/rtl8192d_xmit.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ s32 rtl8192du_hal_xmit(struct rtw_adapter *padapter,
struct xmit_frame *pxmitframe);

#ifdef CONFIG_HOSTAPD_MLME
s32 rtl8192du_hostap_mgnt_xmit_entry(struct rtw_adapter *padapter, _pkt *pkt);
s32 rtl8192du_hostap_mgnt_xmit_entry(struct rtw_adapter *padapter, struct sk_buff *pkt);
#endif

#endif
35 changes: 0 additions & 35 deletions os_dep/ioctl_linux.c.rej

This file was deleted.

0 comments on commit a2deb84

Please sign in to comment.