diff options
Diffstat (limited to 'drivers/firewire/net.c')
| -rw-r--r-- | drivers/firewire/net.c | 21 | 
1 files changed, 3 insertions, 18 deletions
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c index 15475892af0c..5d3640264f2d 100644 --- a/drivers/firewire/net.c +++ b/drivers/firewire/net.c @@ -1368,15 +1368,6 @@ static netdev_tx_t fwnet_tx(struct sk_buff *skb, struct net_device *net)  	return NETDEV_TX_OK;  } -static int fwnet_change_mtu(struct net_device *net, int new_mtu) -{ -	if (new_mtu < 68) -		return -EINVAL; - -	net->mtu = new_mtu; -	return 0; -} -  static const struct ethtool_ops fwnet_ethtool_ops = {  	.get_link	= ethtool_op_get_link,  }; @@ -1385,7 +1376,6 @@ static const struct net_device_ops fwnet_netdev_ops = {  	.ndo_open       = fwnet_open,  	.ndo_stop	= fwnet_stop,  	.ndo_start_xmit = fwnet_tx, -	.ndo_change_mtu = fwnet_change_mtu,  };  static void fwnet_init_dev(struct net_device *net) @@ -1454,7 +1444,6 @@ static int fwnet_probe(struct fw_unit *unit,  	struct net_device *net;  	bool allocated_netdev = false;  	struct fwnet_device *dev; -	unsigned max_mtu;  	int ret;  	union fwnet_hwaddr *ha; @@ -1493,13 +1482,9 @@ static int fwnet_probe(struct fw_unit *unit,  		goto out;  	dev->local_fifo = dev->handler.offset; -	/* -	 * Use the RFC 2734 default 1500 octets or the maximum payload -	 * as initial MTU -	 */ -	max_mtu = (1 << (card->max_receive + 1)) -		  - sizeof(struct rfc2734_header) - IEEE1394_GASP_HDR_SIZE; -	net->mtu = min(1500U, max_mtu); +	net->mtu = 1500U; +	net->min_mtu = ETH_MIN_MTU; +	net->max_mtu = 0xfff;  	/* Set our hardware address while we're at it */  	ha = (union fwnet_hwaddr *)net->dev_addr;  |