Commit a8ec173a authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller

r8169: don't set min_mtu/max_mtu if not needed

Defaults for min_mtu and max_mtu are set by ether_setup(), which is
called from devm_alloc_etherdev(). Let rtl_jumbo_max() only return
a positive value if actually jumbo packets are supported. This also
allows to remove constant Jumbo_1K which is a little misleading anyway.
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6dd4b4f3
...@@ -85,7 +85,6 @@ ...@@ -85,7 +85,6 @@
#define RTL_R16(tp, reg) readw(tp->mmio_addr + (reg)) #define RTL_R16(tp, reg) readw(tp->mmio_addr + (reg))
#define RTL_R32(tp, reg) readl(tp->mmio_addr + (reg)) #define RTL_R32(tp, reg) readl(tp->mmio_addr + (reg))
#define JUMBO_1K ETH_DATA_LEN
#define JUMBO_4K (4*1024 - ETH_HLEN - 2) #define JUMBO_4K (4*1024 - ETH_HLEN - 2)
#define JUMBO_6K (6*1024 - ETH_HLEN - 2) #define JUMBO_6K (6*1024 - ETH_HLEN - 2)
#define JUMBO_7K (7*1024 - ETH_HLEN - 2) #define JUMBO_7K (7*1024 - ETH_HLEN - 2)
...@@ -1494,7 +1493,7 @@ static netdev_features_t rtl8169_fix_features(struct net_device *dev, ...@@ -1494,7 +1493,7 @@ static netdev_features_t rtl8169_fix_features(struct net_device *dev,
if (dev->mtu > TD_MSS_MAX) if (dev->mtu > TD_MSS_MAX)
features &= ~NETIF_F_ALL_TSO; features &= ~NETIF_F_ALL_TSO;
if (dev->mtu > JUMBO_1K && if (dev->mtu > ETH_DATA_LEN &&
tp->mac_version > RTL_GIGA_MAC_VER_06) tp->mac_version > RTL_GIGA_MAC_VER_06)
features &= ~(NETIF_F_CSUM_MASK | NETIF_F_ALL_TSO); features &= ~(NETIF_F_CSUM_MASK | NETIF_F_ALL_TSO);
...@@ -5360,7 +5359,7 @@ static int rtl_jumbo_max(struct rtl8169_private *tp) ...@@ -5360,7 +5359,7 @@ static int rtl_jumbo_max(struct rtl8169_private *tp)
{ {
/* Non-GBit versions don't support jumbo frames */ /* Non-GBit versions don't support jumbo frames */
if (!tp->supports_gmii) if (!tp->supports_gmii)
return JUMBO_1K; return 0;
switch (tp->mac_version) { switch (tp->mac_version) {
/* RTL8169 */ /* RTL8169 */
...@@ -5591,10 +5590,9 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -5591,10 +5590,9 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
dev->hw_features |= NETIF_F_RXALL; dev->hw_features |= NETIF_F_RXALL;
dev->hw_features |= NETIF_F_RXFCS; dev->hw_features |= NETIF_F_RXFCS;
/* MTU range: 60 - hw-specific max */
dev->min_mtu = ETH_ZLEN;
jumbo_max = rtl_jumbo_max(tp); jumbo_max = rtl_jumbo_max(tp);
dev->max_mtu = jumbo_max; if (jumbo_max)
dev->max_mtu = jumbo_max;
rtl_set_irq_mask(tp); rtl_set_irq_mask(tp);
...@@ -5624,7 +5622,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -5624,7 +5622,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
(RTL_R32(tp, TxConfig) >> 20) & 0xfcf, (RTL_R32(tp, TxConfig) >> 20) & 0xfcf,
pci_irq_vector(pdev, 0)); pci_irq_vector(pdev, 0));
if (jumbo_max > JUMBO_1K) if (jumbo_max)
netif_info(tp, probe, dev, netif_info(tp, probe, dev,
"jumbo features [frames: %d bytes, tx checksumming: %s]\n", "jumbo features [frames: %d bytes, tx checksumming: %s]\n",
jumbo_max, tp->mac_version <= RTL_GIGA_MAC_VER_06 ? jumbo_max, tp->mac_version <= RTL_GIGA_MAC_VER_06 ?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment