Subject: Re: [Patch 1/2] s2io: remove lro parameter

From: Jon Mason <[email-masked]>
Date: Wed, 18 Aug 2010 10:36:26 -0500

On Wed, Aug 18, 2010 at 12:51:09AM -0700, Amerigo Wang wrote:
> 
> As suggested by David, this parameter can die, we can use ethtool
> to turn LRO on/off. Compile tests only.

Needs some additional removal

Line 41 and 42 " * lro: Specifies whether to enable Large Receive ..."
As you have removed the modparm

Line 8286 "if (sp->lro)"
As it will always be on in this instance

Also, all references to "sp->lro" can be converted to "(dev->features
& NETIF_F_LRO)", removing an unnecessary variable.

Thanks,
Jon

> 
> Signed-off-by: WANG Cong <[email-masked]>
> 
> ---
> diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
> index 18bc5b7..b981fa9 100644
> --- a/drivers/net/s2io.c
> +++ b/drivers/net/s2io.c
> @@ -496,8 +496,6 @@ S2IO_PARM_INT(rxsync_frequency, 3);
>  /* Interrupt type. Values can be 0(INTA), 2(MSI_X) */
>  S2IO_PARM_INT(intr_type, 2);
>  /* Large receive offload feature */
> -static unsigned int lro_enable = 1;
> -module_param_named(lro, lro_enable, uint, 0);
>  
>  /* Max pkts to be aggregated by LRO at one time. If not specified,
>   * aggregation happens until we hit max IP pkt size(64K)
> @@ -6735,13 +6733,10 @@ static int s2io_ethtool_set_flags(struct net_device *dev, u32 data)
>  		return -EINVAL;
>  
>  	if (data & ETH_FLAG_LRO) {
> -		if (lro_enable) {
> -			if (!(dev->features & NETIF_F_LRO)) {
> -				dev->features |= NETIF_F_LRO;
> -				changed = 1;
> -			}
> -		} else
> -			rc = -EINVAL;
> +		if (!(dev->features & NETIF_F_LRO)) {
> +			dev->features |= NETIF_F_LRO;
> +			changed = 1;
> +		}
>  	} else if (dev->features & NETIF_F_LRO) {
>  		dev->features &= ~NETIF_F_LRO;
>  		changed = 1;
> @@ -7911,7 +7906,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
>  	else
>  		sp->device_type = XFRAME_I_DEVICE;
>  
> -	sp->lro = lro_enable;
> +	sp->lro = 1;
>  
>  	/* Initialize some PCI/PCI-X fields of the NIC. */
>  	s2io_init_pci(sp);
> @@ -8047,8 +8042,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
>  	dev->netdev_ops = &s2io_netdev_ops;
>  	SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
>  	dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
> -	if (lro_enable)
> -		dev->features |= NETIF_F_LRO;
> +	dev->features |= NETIF_F_LRO;
>  	dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM;
>  	if (sp->high_dma_flag == true)
>  		dev->features |= NETIF_F_HIGHDMA;
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to [email-masked]
> More majordomo info at  http://vger.kernel.org/majordomo-info.html