CVS commit: src

[Shoichi YAMAGUCHI]

Module Name:    src
Committed By:   yamaguchi
Date:           Thu Mar 31 01:53:22 UTC 2022

Modified Files:
        src/sbin/ifconfig: lagg.c
        src/sys/net/lagg: if_lagg.c

Log Message:
Change error code to ENOBUFS on lack of buffer memory

pointed out by k-goda@IIJ


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sbin/ifconfig/lagg.c
cvs rdiff -u -r1.35 -r1.36 src/sys/net/lagg/if_lagg.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sbin/ifconfig/lagg.c
diff -u src/sbin/ifconfig/lagg.c:1.2 src/sbin/ifconfig/lagg.c:1.3
--- src/sbin/ifconfig/lagg.c:1.2	Mon Jun 21 03:14:40 2021
+++ src/sbin/ifconfig/lagg.c	Thu Mar 31 01:53:22 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: lagg.c,v 1.2 2021/06/21 03:14:40 christos Exp $	*/
+/*	$NetBSD: lagg.c,v 1.3 2022/03/31 01:53:22 yamaguchi Exp $	*/
 
 /*
  * Copyright (c) 2021 Internet Initiative Japan Inc.
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: lagg.c,v 1.2 2021/06/21 03:14:40 christos Exp $");
+__RCSID("$NetBSD: lagg.c,v 1.3 2022/03/31 01:53:22 yamaguchi Exp $");
 #endif /* !defined(lint) */
 
 #include <sys/param.h>
@@ -269,7 +269,7 @@ getlagg(prop_dictionary_t env)
 		if (indirect_ioctl(env, SIOCGLAGG, req) == 0)
 			goto done;
 
-		if (errno != ENOMEM)
+		if (errno != ENOBUFS)
 			break;
 		nports = req->lrq_nports + 3; /* 3: additional space */
 	}

Index: src/sys/net/lagg/if_lagg.c
diff -u src/sys/net/lagg/if_lagg.c:1.35 src/sys/net/lagg/if_lagg.c:1.36
--- src/sys/net/lagg/if_lagg.c:1.35	Thu Mar 31 01:49:02 2022
+++ src/sys/net/lagg/if_lagg.c	Thu Mar 31 01:53:22 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_lagg.c,v 1.35 2022/03/31 01:49:02 yamaguchi Exp $	*/
+/*	$NetBSD: if_lagg.c,v 1.36 2022/03/31 01:53:22 yamaguchi Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006 Reyk Floeter <r...@openbsd.org>
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_lagg.c,v 1.35 2022/03/31 01:49:02 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lagg.c,v 1.36 2022/03/31 01:53:22 yamaguchi Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -2652,7 +2652,7 @@ lagg_get_stats(struct lagg_softc *sc, st
 	curlwp_bindx(bound);
 
 	if (resp->lrq_nports > nports) {
-		return ENOMEM;
+		return ENOBUFS;
 	}
 	return 0;
 }