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

Commit 857e9203 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: core: fix compilation warning for uninitialized variable"

parents 3c2be410 4e2b7b05

net/core/dev.c

+1 −1
Original line number Diff line number Diff line
@@ -2772,7 +2772,7 @@ out_null: 


struct sk_buff *validate_xmit_skb_list(struct sk_buff *skb, struct net_device *dev)

{

	struct sk_buff *next, *head = NULL, *tail;

	struct sk_buff *next, *head = NULL, *tail = NULL;



	for (; skb != NULL; skb = next) {

		next = skb->next;

net/ipv4/tcp.c

+5 −4
Original line number Diff line number Diff line
@@ -2740,8 +2740,9 @@ void tcp_get_info(const struct sock *sk, struct tcp_info *info) 
	*/

	if (NULL != sk->sk_socket) {

		struct file *filep = sk->sk_socket->file;

		if (NULL != filep)

			info->tcpi_count = atomic_read(&filep->f_count);



		if (filep)

			info->tcpi_count = file_count(filep);

	}

}

EXPORT_SYMBOL_GPL(tcp_get_info);
@@ -3190,7 +3191,7 @@ int tcp_nuke_addr(struct net *net, struct sockaddr *addr) 
	int family = addr->sa_family;

	unsigned int bucket;



	struct in_addr *in;

	struct in_addr *in = NULL;

#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

	struct in6_addr *in6 = NULL;

#endif
@@ -3227,7 +3228,7 @@ restart: 
				if (s4 == LOOPBACK4_IPV6)

					continue;



				if (in->s_addr != s4 &&

				if (in && in->s_addr != s4 &&

				    !(in->s_addr == INADDR_ANY &&

				      !tcp_is_local(net, s4)))

					continue;