Commit 180f5131 authored by Thorsten Winkler's avatar Thorsten Winkler Committed by Jakub Kicinski
Browse files

s390/qeth: Use constant for IP address buffers 



Use INET6_ADDRSTRLEN constant with size of 48 which be used for char arrays
storing ip addresses (for IPv4 and IPv6)

Reviewed-by: default avatarAlexandra Winter <wintera@linux.ibm.com>
Signed-off-by: default avatarThorsten Winkler <twinkler@linux.ibm.com>
Signed-off-by: default avatarAlexandra Winter <wintera@linux.ibm.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent dd4e356c

drivers/s390/net/qeth_l3_main.c

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/etherdevice.h>

#include <linux/ip.h>

#include <linux/in.h>

#include <linux/inet.h>

#include <linux/ipv6.h>

#include <linux/inetdevice.h>

#include <linux/igmp.h>
@@ -158,7 +159,7 @@ static int qeth_l3_add_ip(struct qeth_card *card, struct qeth_ipaddr *tmp_addr) 
{

	int rc = 0;

	struct qeth_ipaddr *addr;

	char buf[40];

	char buf[INET6_ADDRSTRLEN];



	if (tmp_addr->type == QETH_IP_TYPE_RXIP)

		QETH_CARD_TEXT(card, 2, "addrxip");

drivers/s390/net/qeth_l3_sys.c

+3 −3
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ static ssize_t qeth_l3_dev_ipato_add_show(char *buf, struct qeth_card *card, 


	mutex_lock(&card->ip_lock);

	list_for_each_entry(ipatoe, &card->ipato.entries, entry) {

		char addr_str[40];

		char addr_str[INET6_ADDRSTRLEN];

		int entry_len;



		if (ipatoe->proto != proto)
@@ -413,7 +413,7 @@ static int qeth_l3_parse_ipatoe(const char *buf, enum qeth_prot_versions proto, 
	int rc;



	/* Expected input pattern: %addr/%mask */

	sep = strnchr(buf, 40, '/');

	sep = strnchr(buf, INET6_ADDRSTRLEN, '/');

	if (!sep)

		return -EINVAL;
@@ -592,7 +592,7 @@ static ssize_t qeth_l3_dev_ip_add_show(struct device *dev, char *buf, 


	mutex_lock(&card->ip_lock);

	hash_for_each(card->ip_htable, i, ipaddr, hnode) {

		char addr_str[40];

		char addr_str[INET6_ADDRSTRLEN];

		int entry_len;



		if (ipaddr->proto != proto || ipaddr->type != type)