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

Commit b0a713e9 authored by Matthias M. Dellweg's avatar Matthias M. Dellweg Committed by David S. Miller
Browse files

[TCP] MD5: Remove some more unnecessary casting. 



while reviewing the tcp_md5-related code further i came across with
another two of these casts which you probably have missed. I don't
actually think that they impose a problem by now, but as you said we
should remove them.

Signed-off-by: default avatarMatthias M. Dellweg <2500@gmx.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c940587b

net/ipv4/tcp_ipv4.c

+5 −5
Original line number Diff line number Diff line
@@ -858,16 +858,16 @@ int tcp_v4_md5_do_add(struct sock *sk, __be32 addr, 
		      u8 *newkey, u8 newkeylen)

{

	/* Add Key to the list */

	struct tcp4_md5sig_key *key;

	struct tcp_md5sig_key *key;

	struct tcp_sock *tp = tcp_sk(sk);

	struct tcp4_md5sig_key *keys;



	key = (struct tcp4_md5sig_key *)tcp_v4_md5_do_lookup(sk, addr);

	key = tcp_v4_md5_do_lookup(sk, addr);

	if (key) {

		/* Pre-existing entry - just update that one. */

		kfree(key->base.key);

		key->base.key = newkey;

		key->base.keylen = newkeylen;

		kfree(key->key);

		key->key = newkey;

		key->keylen = newkeylen;

	} else {

		struct tcp_md5sig_info *md5sig;

net/ipv6/tcp_ipv6.c

+5 −5
Original line number Diff line number Diff line
@@ -561,16 +561,16 @@ static int tcp_v6_md5_do_add(struct sock *sk, struct in6_addr *peer, 
			     char *newkey, u8 newkeylen)

{

	/* Add key to the list */

	struct tcp6_md5sig_key *key;

	struct tcp_md5sig_key *key;

	struct tcp_sock *tp = tcp_sk(sk);

	struct tcp6_md5sig_key *keys;



	key = (struct tcp6_md5sig_key*) tcp_v6_md5_do_lookup(sk, peer);

	key = tcp_v6_md5_do_lookup(sk, peer);

	if (key) {

		/* modify existing entry - just update that one */

		kfree(key->base.key);

		key->base.key = newkey;

		key->base.keylen = newkeylen;

		kfree(key->key);

		key->key = newkey;

		key->keylen = newkeylen;

	} else {

		/* reallocate new list if current one is full. */

		if (!tp->md5sig_info) {