Patchwork tun: don't set NETIF_F_FRAGLIST

login
register
mail settings
Submitter Mark McLoughlin
Date Nov. 5, 2008, 12:36 p.m.
Message ID <1225888587-1387-1-git-send-email-markmc@redhat.com>
Download mbox | patch
Permalink /patch/7330/
State Accepted
Delegated to: Jeff Garzik
Headers show

Comments

Mark McLoughlin - Nov. 5, 2008, 12:36 p.m.
We don't handle skb_shared_info->frag_list, so we shouldn't
be setting the NETIF_F_FRAGLIST flag.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
---
 drivers/net/tun.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 33b6d1b..7f9084c 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -844,11 +844,11 @@  static int set_offload(struct net_device *dev, unsigned long arg)
 
 	old_features = dev->features;
 	/* Unset features, set them as we chew on the arg. */
-	features = (old_features & ~(NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST
+	features = (old_features & ~(NETIF_F_HW_CSUM|NETIF_F_SG
 				    |NETIF_F_TSO_ECN|NETIF_F_TSO|NETIF_F_TSO6));
 
 	if (arg & TUN_F_CSUM) {
-		features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST;
+		features |= NETIF_F_HW_CSUM|NETIF_F_SG;
 		arg &= ~TUN_F_CSUM;
 
 		if (arg & (TUN_F_TSO4|TUN_F_TSO6)) {