Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79058aca authored by Jouni Malinen's avatar Jouni Malinen Committed by John W. Linville
Browse files

[PATCH] hostap: Make hostap_tx_encrypt() static 



hostap_tx_encrypt() is used only inside hostap_80211_tx.c and there
are no plans to use it elsewhere in the future either, so let's make
it static. As a bonus, this should silence Coverity scanner from
complaining about bogus FORWARD_NULL case (CID: 274).

Signed-off-by: default avatarJouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 00736025

drivers/net/wireless/hostap/hostap_80211.h

+0 −2
Original line number Diff line number Diff line
@@ -92,8 +92,6 @@ void hostap_dump_rx_80211(const char *name, struct sk_buff *skb, 
void hostap_dump_tx_80211(const char *name, struct sk_buff *skb);

int hostap_data_start_xmit(struct sk_buff *skb, struct net_device *dev);

int hostap_mgmt_start_xmit(struct sk_buff *skb, struct net_device *dev);

struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,

				   struct ieee80211_crypt_data *crypt);

int hostap_master_start_xmit(struct sk_buff *skb, struct net_device *dev);



#endif /* HOSTAP_80211_H */

drivers/net/wireless/hostap/hostap_80211_tx.c

+3 −4
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ int hostap_mgmt_start_xmit(struct sk_buff *skb, struct net_device *dev) 




/* Called only from software IRQ */

struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,

static struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,

					  struct ieee80211_crypt_data *crypt)

{

	struct hostap_interface *iface;
@@ -317,7 +317,7 @@ struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb, 
	}



	if (local->tkip_countermeasures &&

	    crypt && crypt->ops && strcmp(crypt->ops->name, "TKIP") == 0) {

	    strcmp(crypt->ops->name, "TKIP") == 0) {

		hdr = (struct ieee80211_hdr_4addr *) skb->data;

		if (net_ratelimit()) {

			printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
@@ -535,5 +535,4 @@ int hostap_master_start_xmit(struct sk_buff *skb, struct net_device *dev) 




EXPORT_SYMBOL(hostap_dump_tx_80211);

EXPORT_SYMBOL(hostap_tx_encrypt);

EXPORT_SYMBOL(hostap_master_start_xmit);