[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <4C6E8AC7.1010606@linux.vnet.ibm.com>
Date: Fri, 20 Aug 2010 09:01:43 -0500
From: Brian King <brking@...ux.vnet.ibm.com>
To: David Miller <davem@...emloft.net>, netdev@...r.kernel.org,
Santiago Leon <santil@...ux.vnet.ibm.com>
Subject: Re: [PATCH 1/3] ibmveth: Remove duplicate checksum offload setup
code
Patches 1-3
Acked-by: Brian King <brking@...ux.vnet.ibm.com>
On 08/18/2010 11:05 AM, Robert Jennings wrote:
> Remove code in the device probe function where we set up the checksum
> offload feature and replace it with a call to an existing function that
> is doing the same. This is done to clean up the driver in preparation
> of adding IPv6 checksum offload support.
>
> Signed-off-by: Robert Jennings <rcj@...ux.vnet.ibm.com>
>
> ---
> drivers/net/ibmveth.c | 18 +-----------------
> 1 file changed, 1 insertion(+), 17 deletions(-)
>
> Index: b/drivers/net/ibmveth.c
> ===================================================================
> --- a/drivers/net/ibmveth.c
> +++ b/drivers/net/ibmveth.c
> @@ -1222,10 +1222,8 @@ static const struct net_device_ops ibmve
> static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id)
> {
> int rc, i;
> - long ret;
> struct net_device *netdev;
> struct ibmveth_adapter *adapter;
> - unsigned long set_attr, ret_attr;
>
> unsigned char *mac_addr_p;
> unsigned int *mcastFilterSize_p;
> @@ -1310,21 +1308,7 @@ static int __devinit ibmveth_probe(struc
>
> ibmveth_debug_printk("registering netdev...\n");
>
> - ret = h_illan_attributes(dev->unit_address, 0, 0, &ret_attr);
> -
> - if (ret == H_SUCCESS && !(ret_attr & IBMVETH_ILLAN_ACTIVE_TRUNK) &&
> - !(ret_attr & IBMVETH_ILLAN_TRUNK_PRI_MASK) &&
> - (ret_attr & IBMVETH_ILLAN_PADDED_PKT_CSUM)) {
> - set_attr = IBMVETH_ILLAN_IPV4_TCP_CSUM;
> -
> - ret = h_illan_attributes(dev->unit_address, 0, set_attr, &ret_attr);
> -
> - if (ret == H_SUCCESS) {
> - adapter->rx_csum = 1;
> - netdev->features |= NETIF_F_IP_CSUM;
> - } else
> - ret = h_illan_attributes(dev->unit_address, set_attr, 0, &ret_attr);
> - }
> + ibmveth_set_csum_offload(netdev, 1, ibmveth_set_tx_csum_flags);
>
> rc = register_netdev(netdev);
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Brian King
Linux on Power Virtualization
IBM Linux Technology Center
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists