From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-170.mta0.migadu.com (out-170.mta0.migadu.com [91.218.175.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC98922173D for ; Tue, 28 Apr 2026 01:29:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777339752; cv=none; b=el2zU7VwGVjoBtB3kEC6rsbjdYHV7OdpCF5f99QUspm9fbVCUK7mhHD8kCtZ5rNuBtMSkOezigzCJ6azNwZh2uE19c2JRVntPG+3NLXTTxlbEdE9qoQMmOlNliCcD28DuSHHQmjQCq0mshlXgxTgWomVQXXcw9NOWBAwqwA+zyI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777339752; c=relaxed/simple; bh=CG71CsRHLCkwEEZkEDxaa0YLMcXA5g/1hjDu7SvoInY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=EVrLpApnC1q3ZfZbVxILDGOgUTy0QGLw8zT5cvZ1P69SRSEgQPUlrIEJBjJkcCHri3d4HK/b1nwFMBaYTUdXcSJwqNPlfLvzGba700KWK+m0wnh1lMw5C/EofAUrD8B5dxGgPPJUCXwMBAtDUAOwVgGn5q8lZOpP0LJmq1/r07c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=mcZ8K/1+; arc=none smtp.client-ip=91.218.175.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="mcZ8K/1+" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1777339738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Be0uEQixrUXyeMbYy+bU6XYNI/yDZs05dC8kB+vODrk=; b=mcZ8K/1+mCpckg0dvFzgrLLx/Vn+LhIYwsPNRe58thaQFUsIKngYJrNBBnB7zONzWZJQw/ Qe/+V8GoudIqkDe0i12B08IPirlNjMcHREIKEPyCFZIX004zqRkTZWzx4FLL5FVHWxjhR5 Ww6oJ5ZDrWduyC+o5zbdedrgnN4Qo18= From: Qingfang Deng To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Qingfang Deng , Julian Braha , Eric Biggers , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: linux-ppp@vger.kernel.org Subject: [PATCH net-next] ppp: add PPPOX symbol Date: Tue, 28 Apr 2026 09:28:26 +0800 Message-ID: <20260428012830.3069-1-qingfang.deng@linux.dev> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT Add a dedicated CONFIG_PPPOX symbol to handle the PPPoX generic module, avoiding redundant pppox.o definitions in the Makefile. Signed-off-by: Qingfang Deng --- drivers/net/ppp/Kconfig | 6 ++++++ drivers/net/ppp/Makefile | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/net/ppp/Kconfig b/drivers/net/ppp/Kconfig index 753354b4e36c..c592648ebd41 100644 --- a/drivers/net/ppp/Kconfig +++ b/drivers/net/ppp/Kconfig @@ -110,8 +110,12 @@ config PPPOATM which can lead to bad results if the ATM peer loses state and changes its encapsulation unilaterally. +config PPPOX + tristate + config PPPOE tristate "PPP over Ethernet" + select PPPOX help Support for PPP over Ethernet. @@ -157,6 +161,7 @@ config PPPOE_HASH_BITS config PPTP tristate "PPP over IPv4 (PPTP)" depends on NET_IPGRE_DEMUX + select PPPOX help Support for PPP over IPv4.(Point-to-Point Tunneling Protocol) @@ -168,6 +173,7 @@ config PPTP config PPPOL2TP tristate "PPP over L2TP" depends on L2TP + select PPPOX help Support for PPP-over-L2TP socket family. L2TP is a protocol used by ISPs and enterprises to tunnel PPP traffic over UDP diff --git a/drivers/net/ppp/Makefile b/drivers/net/ppp/Makefile index 16c457d6b324..a815e1497179 100644 --- a/drivers/net/ppp/Makefile +++ b/drivers/net/ppp/Makefile @@ -9,6 +9,6 @@ obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o -obj-$(CONFIG_PPPOE) += pppox.o pppoe.o -obj-$(CONFIG_PPPOL2TP) += pppox.o -obj-$(CONFIG_PPTP) += pppox.o pptp.o +obj-$(CONFIG_PPPOX) += pppox.o +obj-$(CONFIG_PPPOE) += pppoe.o +obj-$(CONFIG_PPTP) += pptp.o -- 2.43.0