* [Intel-wired-lan] [PATCH] e1000e: use ip_hdrlen() instead of bit shift
@ 2024-08-01 13:47 ` Moon Yeounsu
0 siblings, 0 replies; 6+ messages in thread
From: Moon Yeounsu @ 2024-08-01 13:47 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni
Cc: Moon Yeounsu, netdev, intel-wired-lan, linux-kernel
There's no reason to use bit shift to find the UDP header.
It's not intuitive and it reinvents well-defined functions.
Signed-off-by: Moon Yeounsu <yyyynoom@gmail.com>
---
drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 360ee26557f7..07c4cf84bdf3 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -5731,7 +5731,7 @@ static int e1000_transfer_dhcp_info(struct e1000_adapter *adapter,
if (ip->protocol != IPPROTO_UDP)
return 0;
- udp = (struct udphdr *)((u8 *)ip + (ip->ihl << 2));
+ udp = (struct udphdr *)((u8 *)ip + ip_hdrlen(skb));
if (ntohs(udp->dest) != 67)
return 0;
--
2.45.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] e1000e: use ip_hdrlen() instead of bit shift
@ 2024-08-01 13:47 ` Moon Yeounsu
0 siblings, 0 replies; 6+ messages in thread
From: Moon Yeounsu @ 2024-08-01 13:47 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni
Cc: netdev, linux-kernel, intel-wired-lan, Moon Yeounsu
There's no reason to use bit shift to find the UDP header.
It's not intuitive and it reinvents well-defined functions.
Signed-off-by: Moon Yeounsu <yyyynoom@gmail.com>
---
drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 360ee26557f7..07c4cf84bdf3 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -5731,7 +5731,7 @@ static int e1000_transfer_dhcp_info(struct e1000_adapter *adapter,
if (ip->protocol != IPPROTO_UDP)
return 0;
- udp = (struct udphdr *)((u8 *)ip + (ip->ihl << 2));
+ udp = (struct udphdr *)((u8 *)ip + ip_hdrlen(skb));
if (ntohs(udp->dest) != 67)
return 0;
--
2.45.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Intel-wired-lan] [PATCH] e1000e: use ip_hdrlen() instead of bit shift
2024-08-01 13:47 ` Moon Yeounsu
@ 2024-08-01 14:06 ` Florian Westphal
-1 siblings, 0 replies; 6+ messages in thread
From: Florian Westphal @ 2024-08-01 14:06 UTC (permalink / raw)
To: Moon Yeounsu
Cc: netdev, linux-kernel, edumazet, intel-wired-lan, kuba, pabeni,
davem
Moon Yeounsu <yyyynoom@gmail.com> wrote:
> There's no reason to use bit shift to find the UDP header.
> It's not intuitive and it reinvents well-defined functions.
>
> Signed-off-by: Moon Yeounsu <yyyynoom@gmail.com>
> ---
> drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
> index 360ee26557f7..07c4cf84bdf3 100644
> --- a/drivers/net/ethernet/intel/e1000e/netdev.c
> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
> @@ -5731,7 +5731,7 @@ static int e1000_transfer_dhcp_info(struct e1000_adapter *adapter,
> if (ip->protocol != IPPROTO_UDP)
> return 0;
>
> - udp = (struct udphdr *)((u8 *)ip + (ip->ihl << 2));
> + udp = (struct udphdr *)((u8 *)ip + ip_hdrlen(skb));
This helper needs skb_network_header being set up correctly, are you
sure thats the case here? ip pointer is fetched via data + 14 right
above, so it doesn't look like this would work.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] e1000e: use ip_hdrlen() instead of bit shift
@ 2024-08-01 14:06 ` Florian Westphal
0 siblings, 0 replies; 6+ messages in thread
From: Florian Westphal @ 2024-08-01 14:06 UTC (permalink / raw)
To: Moon Yeounsu
Cc: davem, edumazet, kuba, pabeni, netdev, linux-kernel,
intel-wired-lan
Moon Yeounsu <yyyynoom@gmail.com> wrote:
> There's no reason to use bit shift to find the UDP header.
> It's not intuitive and it reinvents well-defined functions.
>
> Signed-off-by: Moon Yeounsu <yyyynoom@gmail.com>
> ---
> drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
> index 360ee26557f7..07c4cf84bdf3 100644
> --- a/drivers/net/ethernet/intel/e1000e/netdev.c
> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
> @@ -5731,7 +5731,7 @@ static int e1000_transfer_dhcp_info(struct e1000_adapter *adapter,
> if (ip->protocol != IPPROTO_UDP)
> return 0;
>
> - udp = (struct udphdr *)((u8 *)ip + (ip->ihl << 2));
> + udp = (struct udphdr *)((u8 *)ip + ip_hdrlen(skb));
This helper needs skb_network_header being set up correctly, are you
sure thats the case here? ip pointer is fetched via data + 14 right
above, so it doesn't look like this would work.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Intel-wired-lan] [PATCH] e1000e: use ip_hdrlen() instead of bit shift
2024-08-01 14:06 ` Florian Westphal
@ 2024-08-02 2:25 ` Moon Yeounsu
-1 siblings, 0 replies; 6+ messages in thread
From: Moon Yeounsu @ 2024-08-02 2:25 UTC (permalink / raw)
To: Florian Westphal
Cc: netdev, linux-kernel, edumazet, intel-wired-lan, kuba, pabeni,
davem
On Thu, Aug 1, 2024 at 11:06 PM Florian Westphal <fw@strlen.de> wrote:
> This helper needs skb_network_header being set up correctly, are you
> sure thats the case here? ip pointer is fetched via data + 14 right
> above, so it doesn't look like this would work.
I read it once more carefully, and yes, you are right.
Sorry for wasting your time...
It is my first patch to the netdev subsystem.
So... I was too excited. It's all my fault.
Next time, I'll be careful and deliberate.
Thank you for reviewing.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] e1000e: use ip_hdrlen() instead of bit shift
@ 2024-08-02 2:25 ` Moon Yeounsu
0 siblings, 0 replies; 6+ messages in thread
From: Moon Yeounsu @ 2024-08-02 2:25 UTC (permalink / raw)
To: Florian Westphal
Cc: davem, edumazet, kuba, pabeni, netdev, linux-kernel,
intel-wired-lan
On Thu, Aug 1, 2024 at 11:06 PM Florian Westphal <fw@strlen.de> wrote:
> This helper needs skb_network_header being set up correctly, are you
> sure thats the case here? ip pointer is fetched via data + 14 right
> above, so it doesn't look like this would work.
I read it once more carefully, and yes, you are right.
Sorry for wasting your time...
It is my first patch to the netdev subsystem.
So... I was too excited. It's all my fault.
Next time, I'll be careful and deliberate.
Thank you for reviewing.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-08-02 15:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-01 13:47 [Intel-wired-lan] [PATCH] e1000e: use ip_hdrlen() instead of bit shift Moon Yeounsu
2024-08-01 13:47 ` Moon Yeounsu
2024-08-01 14:06 ` [Intel-wired-lan] " Florian Westphal
2024-08-01 14:06 ` Florian Westphal
2024-08-02 2:25 ` [Intel-wired-lan] " Moon Yeounsu
2024-08-02 2:25 ` Moon Yeounsu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.