eth: refresh min_header_len addition patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/queue/net-introduce-device-min_header_len.patch b/queue/net-introduce-device-min_header_len.patch
index 0b340e5..ffee94b 100644
--- a/queue/net-introduce-device-min_header_len.patch
+++ b/queue/net-introduce-device-min_header_len.patch
@@ -1,4 +1,4 @@
-From 217e6fa24ce28ec87fca8da93c9016cb78028612 Mon Sep 17 00:00:00 2001
+From 67cb213aa428fe8f243e10d9e034a57ccc945f03 Mon Sep 17 00:00:00 2001
From: Willem de Bruijn <willemb@google.com>
Date: Tue, 7 Feb 2017 15:57:20 -0500
Subject: [PATCH] net: introduce device min_header_len
@@ -25,9 +25,10 @@
Acked-by: Eric Dumazet <edumazet@google.com>
Acked-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
-index 1e05b7c2d157..0844f8496413 100644
+index 6255973e3dda..1b65f0f975cf 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -164,6 +164,7 @@ static void loopback_setup(struct net_device *dev)
@@ -39,26 +40,26 @@
dev->type = ARPHRD_LOOPBACK; /* 0x0001*/
dev->flags = IFF_LOOPBACK;
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
-index 70ad0291d517..27914672602d 100644
+index 280a9e701161..c00ff7fed7de 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -1511,6 +1511,7 @@ enum netdev_priv_flags {
- * @max_mtu: Interface Maximum MTU value
+@@ -1491,6 +1491,7 @@ enum netdev_priv_flags {
+ * @mtu: Interface MTU value
* @type: Interface hardware type
* @hard_header_len: Maximum hardware header length.
+ * @min_header_len: Minimum hardware header length
*
* @needed_headroom: Extra headroom the hardware may need, but not in all
* cases can this be guaranteed
-@@ -1728,6 +1729,7 @@ struct net_device {
- unsigned int max_mtu;
+@@ -1713,6 +1714,7 @@ struct net_device {
+ unsigned int mtu;
unsigned short type;
unsigned short hard_header_len;
+ unsigned short min_header_len;
unsigned short needed_headroom;
unsigned short needed_tailroom;
-@@ -2694,6 +2696,8 @@ static inline bool dev_validate_header(const struct net_device *dev,
+@@ -2768,6 +2770,8 @@ static inline bool dev_validate_header(const struct net_device *dev,
{
if (likely(len >= dev->hard_header_len))
return true;
@@ -68,7 +69,7 @@
if (capable(CAP_SYS_RAWIO)) {
memset(ll_header + len, 0, dev->hard_header_len - len);
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
-index 8c5a479681ca..516c87e75de7 100644
+index 02acfff36028..24d7aff8db1a 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -356,6 +356,7 @@ void ether_setup(struct net_device *dev)
@@ -77,8 +78,8 @@
dev->hard_header_len = ETH_HLEN;
+ dev->min_header_len = ETH_HLEN;
dev->mtu = ETH_DATA_LEN;
- dev->min_mtu = ETH_MIN_MTU;
- dev->max_mtu = ETH_DATA_LEN;
+ dev->addr_len = ETH_ALEN;
+ dev->tx_queue_len = 1000; /* Ethernet wants good queues */
--
2.12.0
