Commit 848ad5d3 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: rtw_put_snap23a(): Make it static 



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 01ca2e9d

drivers/staging/rtl8723au/core/rtw_xmit.c

+20 −20
Original line number Diff line number Diff line
@@ -1039,6 +1039,25 @@ s32 rtw_txframes_sta_ac_pending23a(struct rtw_adapter *padapter, 
	return ptxservq->qcnt;

}



/* Logical Link Control(LLC) SubNetwork Attachment Point(SNAP) header

 * IEEE LLC/SNAP header contains 8 octets

 * First 3 octets comprise the LLC portion

 * SNAP portion, 5 octets, is divided into two fields:

 *	Organizationally Unique Identifier(OUI), 3 octets,

 *	type, defined by that organization, 2 octets.

 */

static int rtw_put_snap(u8 *data, u16 h_proto)

{

	if (h_proto == ETH_P_IPX || h_proto == ETH_P_AARP)

		ether_addr_copy(data, bridge_tunnel_header);

	else

		ether_addr_copy(data, rfc1042_header);



	data += ETH_ALEN;

	put_unaligned_be16(h_proto, data);

	return ETH_ALEN + sizeof(u16);

}



/*



This sub-routine will perform all the following:
@@ -1162,7 +1181,7 @@ int rtw_xmitframe_coalesce23a(struct rtw_adapter *padapter, struct sk_buff *skb, 
			mpdu_len -= pattrib->iv_len;

		}

		if (frg_inx == 0) {

			llc_sz = rtw_put_snap23a(pframe, pattrib->ether_type);

			llc_sz = rtw_put_snap(pframe, pattrib->ether_type);

			pframe += llc_sz;

			mpdu_len -= llc_sz;

		}
@@ -1232,25 +1251,6 @@ int rtw_xmitframe_coalesce23a(struct rtw_adapter *padapter, struct sk_buff *skb, 
	return res;

}



/* Logical Link Control(LLC) SubNetwork Attachment Point(SNAP) header

 * IEEE LLC/SNAP header contains 8 octets

 * First 3 octets comprise the LLC portion

 * SNAP portion, 5 octets, is divided into two fields:

 *	Organizationally Unique Identifier(OUI), 3 octets,

 *	type, defined by that organization, 2 octets.

 */

s32 rtw_put_snap23a(u8 *data, u16 h_proto)

{

	if (h_proto == ETH_P_IPX || h_proto == ETH_P_AARP)

		ether_addr_copy(data, bridge_tunnel_header);

	else

		ether_addr_copy(data, rfc1042_header);



	data += ETH_ALEN;

	put_unaligned_be16(h_proto, data);

	return ETH_ALEN + sizeof(u16);

}



void rtw_update_protection23a(struct rtw_adapter *padapter, u8 *ie, uint ie_len)

{

	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;

drivers/staging/rtl8723au/include/rtw_xmit.h

+0 −1
Original line number Diff line number Diff line
@@ -340,7 +340,6 @@ s32 rtw_free_xmitbuf23a(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); 
void rtw_count_tx_stats23a(struct rtw_adapter *padapter,

			struct xmit_frame *pxmitframe, int sz);

void rtw_update_protection23a(struct rtw_adapter *padapter, u8 *ie, uint ie_len);

s32 rtw_put_snap23a(u8 *data, u16 h_proto);

struct xmit_frame *rtw_alloc_xmitframe23a_ext(struct xmit_priv *pxmitpriv);

struct xmit_frame *rtw_alloc_xmitframe23a_once(struct xmit_priv *pxmitpriv);

s32 rtw_free_xmitframe23a(struct xmit_priv *pxmitpriv,