[PATCH 3/8] net: use rest_of_page() macro where appropriate

Yury Norov
2026-03-04T01:27:38Z

Switch networking codebase to using the macro. No functional changes
intended.

Signed-off-by: Yury Norov <ynorov@nvidia.com>
---
drivers/net/ethernet/meta/fbnic/fbnic_tlv.c | 6 +++---
drivers/s390/net/qeth_core_main.c | 6 ++----
2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_tlv.c b/drivers/net/ethernet/meta/fbnic/fbnic_tlv.c
index 517ed8b2f1cb..2e80c25ba3c8 100644
--- a/drivers/net/ethernet/meta/fbnic/fbnic_tlv.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_tlv.c
@@ -52,7 +52,7 @@ struct fbnic_tlv_msg *fbnic_tlv_msg_alloc(u16 msg_id)
**/
int fbnic_tlv_attr_put_flag(struct fbnic_tlv_msg *msg, const u16 attr_id)
{
- int attr_max_len = PAGE_SIZE - offset_in_page(msg) - sizeof(*msg);
+ int attr_max_len = rest_of_page(msg) - sizeof(*msg);
struct fbnic_tlv_hdr hdr = { 0 };
struct fbnic_tlv_msg *attr;

@@ -94,7 +94,7 @@ int fbnic_tlv_attr_put_flag(struct fbnic_tlv_msg *msg, const u16 attr_id)
int fbnic_tlv_attr_put_value(struct fbnic_tlv_msg *msg, const u16 attr_id,
const void *value, const int len)
{
- int attr_max_len = PAGE_SIZE - offset_in_page(msg) - sizeof(*msg);
+ int attr_max_len = rest_of_page(msg) - sizeof(*msg);
struct fbnic_tlv_hdr hdr = { 0 };
struct fbnic_tlv_msg *attr;

@@ -292,7 +292,7 @@ ssize_t fbnic_tlv_attr_get_string(struct fbnic_tlv_msg *attr, char *dst,
struct fbnic_tlv_msg *fbnic_tlv_attr_nest_start(struct fbnic_tlv_msg *msg,
u16 attr_id)
{
- int attr_max_len = PAGE_SIZE - offset_in_page(msg) - sizeof(*msg);
+ int attr_max_len = rest_of_page(msg) - sizeof(*msg);
struct fbnic_tlv_msg *attr = &msg[le16_to_cpu(msg->hdr.len)];
struct fbnic_tlv_hdr hdr = { 0 };

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index cf5f760d0e02..5012c22d8f37 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -4087,8 +4087,7 @@ static unsigned int qeth_fill_buffer(struct qeth_qdio_out_buffer *buf,

/* map linear part into buffer element(s) */
while (length > 0) {
- elem_length = min_t(unsigned int, length,
- PAGE_SIZE - offset_in_page(data));
+ elem_length = min_t(unsigned int, length, rest_of_page(data));

buffer->element[element].addr = virt_to_dma64(data);
buffer->element[element].length = elem_length;
@@ -4117,8 +4116,7 @@ static unsigned int qeth_fill_buffer(struct qeth_qdio_out_buffer *buf,
data = skb_frag_address(frag);
length = skb_frag_size(frag);
while (length > 0) {
- elem_length = min_t(unsigned int, length,
- PAGE_SIZE - offset_in_page(data));
+ elem_length = min_t(unsigned int, length, rest_of_page(data));

buffer->element[element].addr = virt_to_dma64(data);
buffer->element[element].length = elem_length;
--
2.43.0