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

Commit 3289a836 authored by John W. Linville's avatar John W. Linville
Browse files

lib80211: remove unused host_build_iv option 



Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ea65145d

drivers/net/wireless/ipw2x00/libipw.h

+0 −1
Original line number Diff line number Diff line
@@ -828,7 +828,6 @@ struct libipw_device { 
	int host_strip_iv_icv;



	int host_open_frag;

	int host_build_iv;

	int ieee802_1x;		/* is IEEE 802.1X used */



	/* WPA data */

drivers/net/wireless/ipw2x00/libipw_tx.c

+3 −13
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev) 
	int i, bytes_per_frag, nr_frags, bytes_last_frag, frag_size,

	    rts_required;

	unsigned long flags;

	int encrypt, host_encrypt, host_encrypt_msdu, host_build_iv;

	int encrypt, host_encrypt, host_encrypt_msdu;

	__be16 ether_type;

	int bytes, fc, hdr_len;

	struct sk_buff *skb_frag;
@@ -301,7 +301,6 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev) 


	host_encrypt = ieee->host_encrypt && encrypt && crypt;

	host_encrypt_msdu = ieee->host_encrypt_msdu && encrypt && crypt;

	host_build_iv = ieee->host_build_iv && encrypt && crypt;



	if (!encrypt && ieee->ieee802_1x &&

	    ieee->drop_unencrypted && ether_type != htons(ETH_P_PAE)) {
@@ -313,7 +312,7 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev) 
	skb_copy_from_linear_data(skb, dest, ETH_ALEN);

	skb_copy_from_linear_data_offset(skb, ETH_ALEN, src, ETH_ALEN);



	if (host_encrypt || host_build_iv)

	if (host_encrypt)

		fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA |

		    IEEE80211_FCTL_PROTECTED;

	else
@@ -467,7 +466,7 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev) 
	for (; i < nr_frags; i++) {

		skb_frag = txb->fragments[i];



		if (host_encrypt || host_build_iv)

		if (host_encrypt)

			skb_reserve(skb_frag,

				    crypt->ops->extra_mpdu_prefix_len);
@@ -502,15 +501,6 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev) 
		 * to insert the IV between the header and the payload */

		if (host_encrypt)

			libipw_encrypt_fragment(ieee, skb_frag, hdr_len);

		else if (host_build_iv) {

			atomic_inc(&crypt->refcnt);

			if (crypt->ops->build_iv)

				crypt->ops->build_iv(skb_frag, hdr_len,

				      ieee->sec.keys[ieee->sec.active_key],

				      ieee->sec.key_sizes[ieee->sec.active_key],

				      crypt->priv);

			atomic_dec(&crypt->refcnt);

		}



		if (ieee->config &

		    (CFG_LIBIPW_COMPUTE_FCS | CFG_LIBIPW_RESERVE_FCS))

drivers/net/wireless/ipw2x00/libipw_wx.c

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ int libipw_wx_set_encode(struct libipw_device *ieee, 
	};

	int i, key, key_provided, len;

	struct lib80211_crypt_data **crypt;

	int host_crypto = ieee->host_encrypt || ieee->host_decrypt || ieee->host_build_iv;

	int host_crypto = ieee->host_encrypt || ieee->host_decrypt;

	DECLARE_SSID_BUF(ssid);



	LIBIPW_DEBUG_WX("SET_ENCODE\n");

include/net/lib80211.h

+0 −3
Original line number Diff line number Diff line
@@ -54,9 +54,6 @@ struct lib80211_crypto_ops { 
	/* deinitialize crypto context and free allocated private data */

	void (*deinit) (void *priv);



	int (*build_iv) (struct sk_buff * skb, int hdr_len,

			 u8 *key, int keylen, void *priv);



	/* encrypt/decrypt return < 0 on error or >= 0 on success. The return

	 * value from decrypt_mpdu is passed as the keyidx value for

	 * decrypt_msdu. skb must have enough head and tail room for the

net/wireless/lib80211_crypt_ccmp.c

+0 −1
Original line number Diff line number Diff line
@@ -467,7 +467,6 @@ static struct lib80211_crypto_ops lib80211_crypt_ccmp = { 
	.name = "CCMP",

	.init = lib80211_ccmp_init,

	.deinit = lib80211_ccmp_deinit,

	.build_iv = lib80211_ccmp_hdr,

	.encrypt_mpdu = lib80211_ccmp_encrypt,

	.decrypt_mpdu = lib80211_ccmp_decrypt,

	.encrypt_msdu = NULL,