From patchwork Fri Apr 22 11:07:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shan Wei X-Patchwork-Id: 92518 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D74E61007DC for ; Fri, 22 Apr 2011 21:11:28 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754926Ab1DVLLW (ORCPT ); Fri, 22 Apr 2011 07:11:22 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:49399 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1754563Ab1DVLLW (ORCPT ); Fri, 22 Apr 2011 07:11:22 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id B1B3617011A; Fri, 22 Apr 2011 19:11:19 +0800 (CST) Received: from mailserver.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id p3MBBJIw004523; Fri, 22 Apr 2011 19:11:19 +0800 Received: from [10.167.225.31] ([10.167.225.31]) by mailserver.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2011042219115090-126460 ; Fri, 22 Apr 2011 19:11:50 +0800 Message-ID: <4DB16181.9010306@cn.fujitsu.com> Date: Fri, 22 Apr 2011 19:07:45 +0800 From: Shan Wei User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.13pre) Gecko/20101113 Shredder/3.1.7pre MIME-Version: 1.0 To: David Miller , netdev , Patrick McHardy , rusty@rustcorp.com.au, mst@redhat.com, Eric Dumazet , krkumar2@in.ibm.com, mirq-linux@rere.qmqm.pl, joe@perches.com Subject: [PATCH net-next 2/3] net: fullly using NETIF_F_GSO_SOFTWARE macros and NETIF_F_SOFT_FEATURES X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-04-22 19:11:50, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-04-22 19:11:51, Serialize complete at 2011-04-22 19:11:51 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fullly using NETIF_F_GSO_SOFTWARE and NETIF_F_SOFT_FEATURES. And some code style tuning. Just compile test. Signed-off-by: Shan Wei --- drivers/net/loopback.c | 14 +++++--------- drivers/net/macvlan.c | 4 ++-- drivers/net/tun.c | 5 ++--- drivers/net/virtio_net.c | 5 ++--- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index d70fb76..0d6b6ba 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c @@ -165,16 +165,12 @@ static void loopback_setup(struct net_device *dev) dev->type = ARPHRD_LOOPBACK; /* 0x0001*/ dev->flags = IFF_LOOPBACK; dev->priv_flags &= ~IFF_XMIT_DST_RELEASE; - dev->hw_features = NETIF_F_ALL_TSO | NETIF_F_UFO; + dev->hw_features = NETIF_F_GSO_SOFTWARE; dev->features = NETIF_F_SG | NETIF_F_FRAGLIST - | NETIF_F_ALL_TSO - | NETIF_F_UFO - | NETIF_F_NO_CSUM - | NETIF_F_RXCSUM - | NETIF_F_HIGHDMA - | NETIF_F_LLTX - | NETIF_F_NETNS_LOCAL - | NETIF_F_VLAN_CHALLENGED; + | NETIF_F_GSO_SOFTWARE | NETIF_F_NO_CSUM + | NETIF_F_RXCSUM | NETIF_F_HIGHDMA + | NETIF_F_LLTX | NETIF_F_NETNS_LOCAL + | NETIF_F_VLAN_CHALLENGED; dev->ethtool_ops = &loopback_ethtool_ops; dev->header_ops = ð_header_ops; dev->netdev_ops = &loopback_ops; diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 3ad5425..a9095af 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -414,8 +414,8 @@ static struct lock_class_key macvlan_netdev_addr_lock_key; #define MACVLAN_FEATURES \ (NETIF_F_SG | NETIF_F_ALL_CSUM | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \ - NETIF_F_GSO | NETIF_F_TSO | NETIF_F_UFO | NETIF_F_GSO_ROBUST | \ - NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_GRO | NETIF_F_RXCSUM) + NETIF_F_GSO_SOFTWARE | NETIF_F_GSO_ROBUST | NETIF_F_SOFT_FEATURES | \ + NETIF_F_RXCSUM) #define MACVLAN_STATE_MASK \ ((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT)) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index ade3cf9..0aca641 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -124,8 +124,7 @@ struct tun_struct { struct net_device *dev; u32 set_features; -#define TUN_USER_FEATURES (NETIF_F_HW_CSUM|NETIF_F_TSO_ECN|NETIF_F_TSO| \ - NETIF_F_TSO6|NETIF_F_UFO) +#define TUN_USER_FEATURES (NETIF_F_HW_CSUM | NETIF_F_GSO_SOFTWARE) struct fasync_struct *fasync; struct tap_filter txflt; @@ -1106,7 +1105,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) } dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST | - TUN_USER_FEATURES; + TUN_USER_FEATURES; dev->features = dev->hw_features; err = register_netdevice(tun->dev); diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 0cb0b06..133419a 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -904,8 +904,7 @@ static int virtnet_probe(struct virtio_device *vdev) dev->features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST; if (virtio_has_feature(vdev, VIRTIO_NET_F_GSO)) { - dev->hw_features |= NETIF_F_TSO | NETIF_F_UFO - | NETIF_F_TSO_ECN | NETIF_F_TSO6; + dev->hw_features |= NETIF_F_GSO_SOFTWARE; } /* Individual feature bits: what can host handle? */ if (virtio_has_feature(vdev, VIRTIO_NET_F_HOST_TSO4)) @@ -918,7 +917,7 @@ static int virtnet_probe(struct virtio_device *vdev) dev->hw_features |= NETIF_F_UFO; if (gso) - dev->features |= dev->hw_features & (NETIF_F_ALL_TSO|NETIF_F_UFO); + dev->features |= dev->hw_features & NETIF_F_GSO_SOFTWARE; /* (!csum && gso) case will be fixed by register_netdev() */ }