staging: r8188eu: make rtw_recv_indicatepkt() static

The function rtw_recv_indicatepkt() is only used in rtw_recv.c.
Make it static.

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220807181538.8499-5-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c
index 8f2b131eb767487b4e199c2088e173b9d3c9c6b1..ee3817c3e1fd072be95328c80246c59475c29a8a 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_recv.c
+++ b/drivers/staging/r8188eu/core/rtw_recv.c
@@ -1579,6 +1579,85 @@ static bool enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, s
        return true;
 }
 
+static int rtw_recv_indicatepkt(struct adapter *padapter, struct recv_frame *precv_frame)
+{
+       struct recv_priv *precvpriv;
+       struct __queue *pfree_recv_queue;
+       struct sk_buff *skb;
+       struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
+
+       precvpriv = &padapter->recvpriv;
+       pfree_recv_queue = &precvpriv->free_recv_queue;
+
+       skb = precv_frame->pkt;
+       if (!skb)
+               goto _recv_indicatepkt_drop;
+
+       skb->data = precv_frame->rx_data;
+
+       skb_set_tail_pointer(skb, precv_frame->len);
+
+       skb->len = precv_frame->len;
+
+       if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
+               struct sk_buff *pskb2 = NULL;
+               struct sta_info *psta = NULL;
+               struct sta_priv *pstapriv = &padapter->stapriv;
+               struct rx_pkt_attrib *pattrib = &precv_frame->attrib;
+               bool bmcast = is_multicast_ether_addr(pattrib->dst);
+
+               if (memcmp(pattrib->dst, myid(&padapter->eeprompriv), ETH_ALEN)) {
+                       if (bmcast) {
+                               psta = rtw_get_bcmc_stainfo(padapter);
+                               pskb2 = skb_clone(skb, GFP_ATOMIC);
+                       } else {
+                               psta = rtw_get_stainfo(pstapriv, pattrib->dst);
+                       }
+
+                       if (psta) {
+                               struct net_device *pnetdev;
+
+                               pnetdev = (struct net_device *)padapter->pnetdev;
+                               skb->dev = pnetdev;
+                               skb_set_queue_mapping(skb, rtw_recv_select_queue(skb));
+
+                               rtw_xmit_entry(skb, pnetdev);
+
+                               if (bmcast)
+                                       skb = pskb2;
+                               else
+                                       goto _recv_indicatepkt_end;
+                       }
+               }
+       }
+
+       rcu_read_lock();
+       rcu_dereference(padapter->pnetdev->rx_handler_data);
+       rcu_read_unlock();
+
+       skb->ip_summed = CHECKSUM_NONE;
+       skb->dev = padapter->pnetdev;
+       skb->protocol = eth_type_trans(skb, padapter->pnetdev);
+
+       netif_rx(skb);
+
+_recv_indicatepkt_end:
+
+       /*  pointers to NULL before rtw_free_recvframe() */
+       precv_frame->pkt = NULL;
+
+       rtw_free_recvframe(precv_frame, pfree_recv_queue);
+
+       return _SUCCESS;
+
+_recv_indicatepkt_drop:
+
+       /* enqueue back to free_recv_queue */
+       rtw_free_recvframe(precv_frame, pfree_recv_queue);
+
+       return _FAIL;
+}
+
 static bool recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced)
 {
        struct list_head *phead, *plist;

diff --git a/drivers/staging/r8188eu/include/recv_osdep.h b/drivers/staging/r8188eu/include/recv_osdep.h
index 135fbb24fcbb987c8d3274745770211bc28c9789..e824bfac067e557301e8de1c1f7aebaa37865d03 100644 (file)
--- a/drivers/staging/r8188eu/include/recv_osdep.h
+++ b/drivers/staging/r8188eu/include/recv_osdep.h
@@ -11,7 +11,6 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter);
 void _rtw_free_recv_priv(struct recv_priv *precvpriv);
 
 s32  rtw_recv_entry(struct recv_frame *precv_frame);
-int rtw_recv_indicatepkt(struct adapter *adapter, struct recv_frame *recv_frame);
 void rtw_recv_returnpacket(struct  net_device *cnxt, struct sk_buff *retpkt);
 
 int rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter);

diff --git a/drivers/staging/r8188eu/os_dep/recv_linux.c b/drivers/staging/r8188eu/os_dep/recv_linux.c
index 08dfe4482b8e259d4c3bccd9a2a510a4cfccb34e..ccf23e7fc4abd0419ea6cc8202de2ce9e34e2c7c 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/recv_linux.c
+++ b/drivers/staging/r8188eu/os_dep/recv_linux.c
@@ -12,87 +12,6 @@
 #include "../include/osdep_intf.h"
 #include "../include/usb_ops.h"
 
-int rtw_recv_indicatepkt(struct adapter *padapter,
-                        struct recv_frame *precv_frame)
-{
-       struct recv_priv *precvpriv;
-       struct __queue *pfree_recv_queue;
-       struct sk_buff *skb;
-       struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
-
-       precvpriv = &padapter->recvpriv;
-       pfree_recv_queue = &precvpriv->free_recv_queue;
-
-       skb = precv_frame->pkt;
-       if (!skb)
-               goto _recv_indicatepkt_drop;
-
-       skb->data = precv_frame->rx_data;
-
-       skb_set_tail_pointer(skb, precv_frame->len);
-
-       skb->len = precv_frame->len;
-
-       if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
-               struct sk_buff *pskb2 = NULL;
-               struct sta_info *psta = NULL;
-               struct sta_priv *pstapriv = &padapter->stapriv;
-               struct rx_pkt_attrib *pattrib = &precv_frame->attrib;
-               bool bmcast = is_multicast_ether_addr(pattrib->dst);
-
-               if (memcmp(pattrib->dst, myid(&padapter->eeprompriv),
-                                ETH_ALEN)) {
-                       if (bmcast) {
-                               psta = rtw_get_bcmc_stainfo(padapter);
-                               pskb2 = skb_clone(skb, GFP_ATOMIC);
-                       } else {
-                               psta = rtw_get_stainfo(pstapriv, pattrib->dst);
-                       }
-
-                       if (psta) {
-                               struct net_device *pnetdev;
-
-                               pnetdev = (struct net_device *)padapter->pnetdev;
-                               skb->dev = pnetdev;
-                               skb_set_queue_mapping(skb, rtw_recv_select_queue(skb));
-
-                               rtw_xmit_entry(skb, pnetdev);
-
-                               if (bmcast)
-                                       skb = pskb2;
-                               else
-                                       goto _recv_indicatepkt_end;
-                       }
-               }
-       }
-
-       rcu_read_lock();
-       rcu_dereference(padapter->pnetdev->rx_handler_data);
-       rcu_read_unlock();
-
-       skb->ip_summed = CHECKSUM_NONE;
-       skb->dev = padapter->pnetdev;
-       skb->protocol = eth_type_trans(skb, padapter->pnetdev);
-
-       netif_rx(skb);
-
-_recv_indicatepkt_end:
-
-       /*  pointers to NULL before rtw_free_recvframe() */
-       precv_frame->pkt = NULL;
-
-       rtw_free_recvframe(precv_frame, pfree_recv_queue);
-
-       return _SUCCESS;
-
-_recv_indicatepkt_drop:
-
-        /* enqueue back to free_recv_queue */
-               rtw_free_recvframe(precv_frame, pfree_recv_queue);
-
-        return _FAIL;
-}
-
 static void _rtw_reordering_ctrl_timeout_handler(struct timer_list *t)
 {
        struct recv_reorder_ctrl *preorder_ctrl;