sunvnet: allow admin to set sunvnet MTU

PATCH Superseded David L Stevens 2 participants 2 messages Sep 12, 2014 – Sep 13, 2014

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

David L Stevens

author

2014-09-12 22:22 UTC #0 lore raw

PATCH 2/3 sunvnet: allow admin to set sunvnet MTU

This patch allows an admin to set the MTU on a sunvnet device to arbitrary values between the minimum (68) and maximum (65535) IPv4 packet sizes.

Signed-off-by David L Stevens <[email protected]>

---
 drivers/net/ethernet/sun/sunvnet.c |    6 +++++-
 drivers/net/ethernet/sun/sunvnet.h |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

drivers/net/ethernet/sun/sunvnet.c +4 -1

index a6418bb..b557ec4 100644
@@ -751,6 +751,10 @@ static int vnet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	if (unlikely(!port))
 		goto out_dropped;
 +	if (skb->len > port->vio.rmtu) {
+		goto out_dropped;
+	}
+
 	spin_lock_irqsave(&port->vio.lock, flags);
  	dr = &port->vio.drings[VIO_DRIVER_TX_RING];

@@ -972,7 +976,7 @@ static void vnet_set_rx_mode(struct net_device *dev)
  static int vnet_change_mtu(struct net_device *dev, int new_mtu)
 {
-	if (new_mtu != ETH_DATA_LEN)
+	if (new_mtu < 68 || new_mtu > 65535)
 		return -EINVAL;
  	dev->mtu = new_mtu;

drivers/net/ethernet/sun/sunvnet.h +1 -0

index 243ae69..fcf0129 100644
@@ -11,7 +11,7 @@
  */
 #define VNET_TX_TIMEOUT			(5 * HZ)
 -#define VNET_MAXPACKET			1518ULL /* ETH_FRAMELEN + VLAN_HDR */
+#define VNET_MAXPACKET			65553ULL /* 64K-1  +ETH HDR +VLAN HDR*/
 #define VNET_TX_RING_SIZE		512
 #define VNET_TX_WAKEUP_THRESH(dr)	((dr)->pending / 4)
 -- 1.7.1

Sergei Shtylyov

2014-09-13 20:14 UTC #1 lore raw

Hello.

Quoted 14 lines · David L Stevens

This patch allows an admin to set the MTU on a sunvnet device to arbitrary values between the minimum (68) and maximum (65535) IPv4 packet sizes.
Signed-off-by David L Stevens <[email protected]>
---
  drivers/net/ethernet/sun/sunvnet.c |    6 +++++-
  drivers/net/ethernet/sun/sunvnet.h |    2 +-
  2 files changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/sun/sunvnet.c +0 -0
index a6418bb..b557ec4 100644

drivers/net/ethernet/sun/sunvnet.c static int vnet_start_xmit(struct sk_buff *skb, struct net_device *dev) · line 753

Quoted 3 lines

drivers/net/ethernet/sun/sunvnet.c +0 -0

@@ -751,6 +751,10 @@ static int vnet_start_xmit(struct sk_buff *skb, struct net_device *dev)
  	if (unlikely(!port))
  		goto out_dropped;
  +	if (skb->len > port->vio.rmtu) {

The patch seems somehow spoiled -- there should be no space before +.

drivers/net/ethernet/sun/sunvnet.c static int vnet_start_xmit(struct sk_buff *skb, struct net_device *dev) · line 758

Quoted 5 lines

drivers/net/ethernet/sun/sunvnet.c +3 -0

+		goto out_dropped;
+	}
+
  	spin_lock_irqsave(&port->vio.lock, flags);
   	dr = &port->vio.drings[VIO_DRIVER_TX_RING];

WBR, Sergei