From d37aaa0e27c402612042e237e978d87b68e5730f Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Mon, 9 Jul 2012 14:09:26 +0000 Subject: [PATCH] --- yaml --- r: 315090 b: refs/heads/master c: b6457acfb7e54e3e22f0524f207dd69e9681c7bb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/cisco/enic/enic_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4f7384e78f3a..eabed84f1e51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c8b73ca43dc6f419e02597d9942222b7987e74c +refs/heads/master: b6457acfb7e54e3e22f0524f207dd69e9681c7bb diff --git a/trunk/drivers/net/ethernet/cisco/enic/enic_main.c b/trunk/drivers/net/ethernet/cisco/enic/enic_main.c index 8132c785cea8..ad1468b3ab91 100644 --- a/trunk/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/trunk/drivers/net/ethernet/cisco/enic/enic_main.c @@ -1300,8 +1300,6 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq, skb->ip_summed = CHECKSUM_COMPLETE; } - skb->dev = netdev; - if (vlan_stripped) __vlan_hwaccel_put_tag(skb, vlan_tci);