From 1934f220b58b0e023b2d5a2f7d9254f333179b3f Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Mon, 3 Jan 2011 10:35:22 +0000
Subject: [PATCH] --- yaml --- r: 225451 b: refs/heads/master c:
 39980292fda20b38baf95bfa577db8b678eecc86 h: refs/heads/master i:   225449:
 e6f49f48dd3088967b4af980413eb5638958071a   225447:
 30fbe8cfaabe305685259175f08ff305cd5dfb68 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/ifb.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c9fdeffee1ce..b85da9f7ae27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dfb33a0d7e2d9316eb4441a065ddd173f87223e
+refs/heads/master: 39980292fda20b38baf95bfa577db8b678eecc86
diff --git a/trunk/drivers/net/ifb.c b/trunk/drivers/net/ifb.c
index 124dac4532b2..e07d487f015a 100644
--- a/trunk/drivers/net/ifb.c
+++ b/trunk/drivers/net/ifb.c
@@ -126,6 +126,10 @@ static const struct net_device_ops ifb_netdev_ops = {
 	.ndo_validate_addr = eth_validate_addr,
 };
 
+#define IFB_FEATURES (NETIF_F_NO_CSUM | NETIF_F_SG  | NETIF_F_FRAGLIST	| \
+		      NETIF_F_TSO_ECN | NETIF_F_TSO | NETIF_F_TSO6	| \
+		      NETIF_F_HIGHDMA | NETIF_F_HW_VLAN_TX)
+
 static void ifb_setup(struct net_device *dev)
 {
 	/* Initialize the device structure. */
@@ -136,6 +140,9 @@ static void ifb_setup(struct net_device *dev)
 	ether_setup(dev);
 	dev->tx_queue_len = TX_Q_LIMIT;
 
+	dev->features |= IFB_FEATURES;
+	dev->vlan_features |= IFB_FEATURES;
+
 	dev->flags |= IFF_NOARP;
 	dev->flags &= ~IFF_MULTICAST;
 	dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;