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

Commit fa05f128 authored by Jens Axboe's avatar Jens Axboe
Browse files

Update net/ to use sg helpers 



Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 60c74f81

net/core/skbuff.c

+2 −2
Original line number Diff line number Diff line
@@ -2045,7 +2045,7 @@ skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len) 
	if (copy > 0) {

		if (copy > len)

			copy = len;

		sg[elt].page = virt_to_page(skb->data + offset);

		sg_set_page(&sg[elt], virt_to_page(skb->data + offset));

		sg[elt].offset = (unsigned long)(skb->data + offset) % PAGE_SIZE;

		sg[elt].length = copy;

		elt++;
@@ -2065,7 +2065,7 @@ skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len) 


			if (copy > len)

				copy = len;

			sg[elt].page = frag->page;

			sg_set_page(&sg[elt], frag->page);

			sg[elt].offset = frag->page_offset+offset-start;

			sg[elt].length = copy;

			elt++;

net/ieee80211/ieee80211_crypt_tkip.c

+5 −8
Original line number Diff line number Diff line
@@ -390,9 +390,7 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	icv[3] = crc >> 24;



	crypto_blkcipher_setkey(tkey->tx_tfm_arc4, rc4key, 16);

	sg.page = virt_to_page(pos);

	sg.offset = offset_in_page(pos);

	sg.length = len + 4;

	sg_init_one(&sg, pos, len + 4);

	return crypto_blkcipher_encrypt(&desc, &sg, &sg, len + 4);

}
@@ -485,9 +483,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	plen = skb->len - hdr_len - 12;



	crypto_blkcipher_setkey(tkey->rx_tfm_arc4, rc4key, 16);

	sg.page = virt_to_page(pos);

	sg.offset = offset_in_page(pos);

	sg.length = plen + 4;

	sg_init_one(&sg, pos, plen + 4);

	if (crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4)) {

		if (net_ratelimit()) {

			printk(KERN_DEBUG ": TKIP: failed to decrypt "
@@ -539,11 +535,12 @@ static int michael_mic(struct crypto_hash *tfm_michael, u8 * key, u8 * hdr, 
		printk(KERN_WARNING "michael_mic: tfm_michael == NULL\n");

		return -1;

	}

	sg[0].page = virt_to_page(hdr);

	sg_init_table(sg, 2);

	sg_set_page(&sg[0], virt_to_page(hdr));

	sg[0].offset = offset_in_page(hdr);

	sg[0].length = 16;



	sg[1].page = virt_to_page(data);

	sg_set_page(&sg[1], virt_to_page(data));

	sg[1].offset = offset_in_page(data);

	sg[1].length = data_len;

net/ieee80211/ieee80211_crypt_wep.c

+2 −6
Original line number Diff line number Diff line
@@ -170,9 +170,7 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	icv[3] = crc >> 24;



	crypto_blkcipher_setkey(wep->tx_tfm, key, klen);

	sg.page = virt_to_page(pos);

	sg.offset = offset_in_page(pos);

	sg.length = len + 4;

	sg_init_one(&sg, pos, len + 4);

	return crypto_blkcipher_encrypt(&desc, &sg, &sg, len + 4);

}
@@ -212,9 +210,7 @@ static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	plen = skb->len - hdr_len - 8;



	crypto_blkcipher_setkey(wep->rx_tfm, key, klen);

	sg.page = virt_to_page(pos);

	sg.offset = offset_in_page(pos);

	sg.length = plen + 4;

	sg_init_one(&sg, pos, plen + 4);

	if (crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4))

		return -7;

net/mac80211/wep.c

+2 −6
Original line number Diff line number Diff line
@@ -138,9 +138,7 @@ void ieee80211_wep_encrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key, 
	*icv = cpu_to_le32(~crc32_le(~0, data, data_len));



	crypto_blkcipher_setkey(tfm, rc4key, klen);

	sg.page = virt_to_page(data);

	sg.offset = offset_in_page(data);

	sg.length = data_len + WEP_ICV_LEN;

	sg_init_one(&sg, data, data_len + WEP_ICV_LEN);

	crypto_blkcipher_encrypt(&desc, &sg, &sg, sg.length);

}
@@ -204,9 +202,7 @@ int ieee80211_wep_decrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key, 
	__le32 crc;



	crypto_blkcipher_setkey(tfm, rc4key, klen);

	sg.page = virt_to_page(data);

	sg.offset = offset_in_page(data);

	sg.length = data_len + WEP_ICV_LEN;

	sg_init_one(&sg, data, data_len + WEP_ICV_LEN);

	crypto_blkcipher_decrypt(&desc, &sg, &sg, sg.length);



	crc = cpu_to_le32(~crc32_le(~0, data, data_len));

net/sctp/auth.c

+2 −1
Original line number Diff line number Diff line
@@ -726,7 +726,8 @@ void sctp_auth_calculate_hmac(const struct sctp_association *asoc, 


	/* set up scatter list */

	end = skb_tail_pointer(skb);

	sg.page = virt_to_page(auth);

	sg_init_table(&sg, 1);

	sg_set_page(&sg, virt_to_page(auth));

	sg.offset = (unsigned long)(auth) % PAGE_SIZE;

	sg.length = end - (unsigned char *)auth;