[U-Boot] [PATCH 1/2] net: fix vlan validation
VLAN identifiers are 12-bit decimal numbers, not IP addresses.
Signed-off-by: Stefan Agner stefan@agner.ch ---
include/env_flags.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/env_flags.h b/include/env_flags.h index 9e87e1b..0dcec06 100644 --- a/include/env_flags.h +++ b/include/env_flags.h @@ -57,8 +57,8 @@ enum env_flags_varaccess { "gatewayip:i," \ "netmask:i," \ "serverip:i," \ - "nvlan:i," \ - "vlan:i," \ + "nvlan:d," \ + "vlan:d," \ "dnsip:i," #else #define ETHADDR_FLAGS
Ethernet packages with IEEE 802.1Q VLAN support may be up to 1522 bytes long. Increase the default size used to allocate packet storage by 4 bytes. While at it, let git care about history and rewrite the comment to represent the situation today only.
Signed-off-by: Stefan Agner stefan@agner.ch ---
include/net.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/include/net.h b/include/net.h index 1fb4194..05800c4 100644 --- a/include/net.h +++ b/include/net.h @@ -465,20 +465,14 @@ struct icmp_hdr { #define IP_ICMP_HDR_SIZE (IP_HDR_SIZE + ICMP_HDR_SIZE)
/* - * Maximum packet size; used to allocate packet storage. - * TFTP packets can be 524 bytes + IP header + ethernet header. - * Lets be conservative, and go for 38 * 16. (Must also be - * a multiple of 32 bytes). - */ -/* - * AS.HARNOIS : Better to set PKTSIZE to maximum size because - * traffic type is not always controlled - * maximum packet size = 1518 + * Maximum packet size; used to allocate packet storage. Use + * the maxium Ethernet frame size as specified by the Ethernet + * standard including the 802.1Q tag (VLAN tagging). + * maximum packet size = 1522 * maximum packet size and multiple of 32 bytes = 1536 */ -#define PKTSIZE 1518 +#define PKTSIZE 1522 #define PKTSIZE_ALIGN 1536 -/*#define PKTSIZE 608*/
/* * Maximum receive ring size; that is, the number of packets
Hi Tom,
Sorry, I accidentally didn't add the v2 in the Subject...
On 2016-04-13 16:38, Stefan Agner wrote: ...
/*
- Maximum packet size; used to allocate packet storage.
- TFTP packets can be 524 bytes + IP header + ethernet header.
- Lets be conservative, and go for 38 * 16. (Must also be
- a multiple of 32 bytes).
- */
-/*
- AS.HARNOIS : Better to set PKTSIZE to maximum size because
- traffic type is not always controlled
- maximum packet size = 1518
- Maximum packet size; used to allocate packet storage. Use
- the maxium Ethernet frame size as specified by the Ethernet
- standard including the 802.1Q tag (VLAN tagging).
*/
- maximum packet size = 1522
- maximum packet size and multiple of 32 bytes = 1536
-#define PKTSIZE 1518 +#define PKTSIZE 1522 #define PKTSIZE_ALIGN 1536 -/*#define PKTSIZE 608*/
I rewrote the whole comment, as I felt it does not make sense to keep history in the source file. Hope this is ok for you.
-- Stefan
On Wed, Apr 13, 2016 at 04:38:02PM -0700, Stefan Agner wrote:
Ethernet packages with IEEE 802.1Q VLAN support may be up to 1522 bytes long. Increase the default size used to allocate packet storage by 4 bytes. While at it, let git care about history and rewrite the comment to represent the situation today only.
Signed-off-by: Stefan Agner stefan@agner.ch
Reviewed-by: Tom Rini trini@konsulko.com
On Wed, Apr 13, 2016 at 6:38 PM, Stefan Agner stefan@agner.ch wrote:
Ethernet packages with IEEE 802.1Q VLAN support may be up to 1522 bytes long. Increase the default size used to allocate packet storage by 4 bytes. While at it, let git care about history and rewrite the comment to represent the situation today only.
Signed-off-by: Stefan Agner stefan@agner.ch
Acked-by: Joe Hershberger joe.hershberger@ni.com
On Wed, Apr 13, 2016 at 04:38:01PM -0700, Stefan Agner wrote:
VLAN identifiers are 12-bit decimal numbers, not IP addresses.
Signed-off-by: Stefan Agner stefan@agner.ch
Reviewed-by: Tom Rini trini@konsulko.com
On Wed, Apr 13, 2016 at 6:38 PM, Stefan Agner stefan@agner.ch wrote:
VLAN identifiers are 12-bit decimal numbers, not IP addresses.
Signed-off-by: Stefan Agner stefan@agner.ch
Acked-by: Joe Hershberger joe.hershberger@ni.com
participants (4)
-
Joe Hershberger -
Joe Hershberger -
Stefan Agner -
Tom Rini