Commit 3e0a6c44 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove os_dep/xmit_linux.c 



Move the last remaining function rtw_xmit_entry(), and the static
functions it calls, from os_dep/xmit_linux.c to core/rtw_xmit.c and
remove the now empty file os_dep/xmit_linux.c.

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220820181623.12497-19-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 30699f23

drivers/staging/r8188eu/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ r8188eu-y = \ 
		os_dep/osdep_service.o \

		os_dep/usb_intf.o \

		os_dep/usb_ops_linux.o \

		os_dep/xmit_linux.o \

		core/rtw_ap.o \

		core/rtw_br_ext.o \

		core/rtw_cmd.o \

drivers/staging/r8188eu/core/rtw_xmit.c

+102 −0
Original line number Diff line number Diff line
@@ -2226,3 +2226,105 @@ void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status) 
	if (pxmitpriv->ack_tx)

		rtw_sctx_done_err(&pack_tx_ops, status);

}



static void rtw_check_xmit_resource(struct adapter *padapter, struct sk_buff *pkt)

{

	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;

	u16 queue;



	queue = skb_get_queue_mapping(pkt);

	if (padapter->registrypriv.wifi_spec) {

		/* No free space for Tx, tx_worker is too slow */

		if (pxmitpriv->hwxmits[queue].accnt > WMM_XMIT_THRESHOLD)

			netif_stop_subqueue(padapter->pnetdev, queue);

	} else {

		if (pxmitpriv->free_xmitframe_cnt <= 4) {

			if (!netif_tx_queue_stopped(netdev_get_tx_queue(padapter->pnetdev, queue)))

				netif_stop_subqueue(padapter->pnetdev, queue);

		}

	}

}



static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)

{

	struct	sta_priv *pstapriv = &padapter->stapriv;

	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;

	struct list_head *phead, *plist;

	struct sk_buff *newskb;

	struct sta_info *psta = NULL;

	s32 res;



	spin_lock_bh(&pstapriv->asoc_list_lock);

	phead = &pstapriv->asoc_list;

	plist = phead->next;



	/* free sta asoc_queue */

	while (phead != plist) {

		psta = container_of(plist, struct sta_info, asoc_list);



		plist = plist->next;



		/* avoid   come from STA1 and send back STA1 */

		if (!memcmp(psta->hwaddr, &skb->data[6], 6))

			continue;



		newskb = skb_copy(skb, GFP_ATOMIC);



		if (newskb) {

			memcpy(newskb->data, psta->hwaddr, 6);

			res = rtw_xmit(padapter, &newskb);

			if (res < 0) {

				pxmitpriv->tx_drop++;

				dev_kfree_skb_any(newskb);

			} else {

				pxmitpriv->tx_pkts++;

			}

		} else {

			pxmitpriv->tx_drop++;



			spin_unlock_bh(&pstapriv->asoc_list_lock);

			return false;	/*  Caller shall tx this multicast frame via normal way. */

		}

	}



	spin_unlock_bh(&pstapriv->asoc_list_lock);

	dev_kfree_skb_any(skb);

	return true;

}



int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)

{

	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);

	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	s32 res = 0;



	if (!rtw_if_up(padapter))

		goto drop_packet;



	rtw_check_xmit_resource(padapter, pkt);



	if (!rtw_mc2u_disable && check_fwstate(pmlmepriv, WIFI_AP_STATE) &&

	    (IP_MCAST_MAC(pkt->data) || ICMPV6_MCAST_MAC(pkt->data)) &&

	    (padapter->registrypriv.wifi_spec == 0)) {

		if (pxmitpriv->free_xmitframe_cnt > (NR_XMITFRAME / 4)) {

			res = rtw_mlcst2unicst(padapter, pkt);

			if (res)

				goto exit;

		}

	}



	res = rtw_xmit(padapter, &pkt);

	if (res < 0)

		goto drop_packet;



	pxmitpriv->tx_pkts++;

	goto exit;



drop_packet:

	pxmitpriv->tx_drop++;

	dev_kfree_skb_any(pkt);



exit:

	return 0;

}

drivers/staging/r8188eu/include/rtw_xmit.h

+1 −0
Original line number Diff line number Diff line
@@ -368,6 +368,7 @@ int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms); 
void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status);



void rtw_xmit_complete(struct adapter *padapter, struct xmit_frame *pxframe);

int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev);



/* include after declaring struct xmit_buf, in order to avoid warning */

#include "xmit_osdep.h"

drivers/staging/r8188eu/include/xmit_osdep.h

+0 −2
Original line number Diff line number Diff line
@@ -17,6 +17,4 @@ struct sta_xmit_priv; 
struct xmit_frame;

struct xmit_buf;



int rtw_xmit_entry(struct sk_buff *pkt, struct  net_device *pnetdev);



#endif /* __XMIT_OSDEP_H_ */

drivers/staging/r8188eu/os_dep/xmit_linux.c

deleted100644 → 0
+0 −115
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright(c) 2007 - 2012 Realtek Corporation. */



#define _XMIT_OSDEP_C_



#include "../include/osdep_service.h"

#include "../include/drv_types.h"

#include "../include/wifi.h"

#include "../include/mlme_osdep.h"

#include "../include/xmit_osdep.h"

#include "../include/osdep_intf.h"

#include "../include/usb_osintf.h"



static void rtw_check_xmit_resource(struct adapter *padapter, struct sk_buff *pkt)

{

	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;

	u16	queue;



	queue = skb_get_queue_mapping(pkt);

	if (padapter->registrypriv.wifi_spec) {

		/* No free space for Tx, tx_worker is too slow */

		if (pxmitpriv->hwxmits[queue].accnt > WMM_XMIT_THRESHOLD)

			netif_stop_subqueue(padapter->pnetdev, queue);

	} else {

		if (pxmitpriv->free_xmitframe_cnt <= 4) {

			if (!netif_tx_queue_stopped(netdev_get_tx_queue(padapter->pnetdev, queue)))

				netif_stop_subqueue(padapter->pnetdev, queue);

		}

	}

}



static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)

{

	struct	sta_priv *pstapriv = &padapter->stapriv;

	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;

	struct list_head *phead, *plist;

	struct sk_buff *newskb;

	struct sta_info *psta = NULL;

	s32	res;



	spin_lock_bh(&pstapriv->asoc_list_lock);

	phead = &pstapriv->asoc_list;

	plist = phead->next;



	/* free sta asoc_queue */

	while (phead != plist) {

		psta = container_of(plist, struct sta_info, asoc_list);



		plist = plist->next;



		/* avoid   come from STA1 and send back STA1 */

		if (!memcmp(psta->hwaddr, &skb->data[6], 6))

			continue;



		newskb = skb_copy(skb, GFP_ATOMIC);



		if (newskb) {

			memcpy(newskb->data, psta->hwaddr, 6);

			res = rtw_xmit(padapter, &newskb);

			if (res < 0) {

				pxmitpriv->tx_drop++;

				dev_kfree_skb_any(newskb);

			} else {

				pxmitpriv->tx_pkts++;

			}

		} else {

			pxmitpriv->tx_drop++;



			spin_unlock_bh(&pstapriv->asoc_list_lock);

			return false;	/*  Caller shall tx this multicast frame via normal way. */

		}

	}



	spin_unlock_bh(&pstapriv->asoc_list_lock);

	dev_kfree_skb_any(skb);

	return true;

}



int rtw_xmit_entry(struct sk_buff *pkt, struct  net_device *pnetdev)

{

	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);

	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;

	struct mlme_priv	*pmlmepriv = &padapter->mlmepriv;

	s32 res = 0;



	if (!rtw_if_up(padapter))

		goto drop_packet;



	rtw_check_xmit_resource(padapter, pkt);



	if (!rtw_mc2u_disable && check_fwstate(pmlmepriv, WIFI_AP_STATE) &&

	    (IP_MCAST_MAC(pkt->data) || ICMPV6_MCAST_MAC(pkt->data)) &&

	    (padapter->registrypriv.wifi_spec == 0)) {

		if (pxmitpriv->free_xmitframe_cnt > (NR_XMITFRAME / 4)) {

			res = rtw_mlcst2unicst(padapter, pkt);

			if (res)

				goto exit;

		}

	}



	res = rtw_xmit(padapter, &pkt);

	if (res < 0)

		goto drop_packet;



	pxmitpriv->tx_pkts++;

	goto exit;



drop_packet:

	pxmitpriv->tx_drop++;

	dev_kfree_skb_any(pkt);



exit:



	return 0;

}