From d688a5d423e9ebd0f11564306ae21dc01b10c032 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Mon, 9 Jul 2012 14:09:27 +0000 Subject: [PATCH] --- yaml --- r: 315091 b: refs/heads/master c: 95f2bce55b2a07a710039b81f93249d0548e1dc4 h: refs/heads/master i: 315089: b4eeed9c958c234090632698eefce64394102a2b 315087: 298a03ce4da7963a72bb7b5fcfa4a4e57a2574c0 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index eabed84f1e51..ea8caa77071b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6457acfb7e54e3e22f0524f207dd69e9681c7bb +refs/heads/master: 95f2bce55b2a07a710039b81f93249d0548e1dc4 diff --git a/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c index 8694124ef77d..b2c1b6764771 100644 --- a/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c +++ b/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c @@ -1532,8 +1532,6 @@ static struct sk_buff *netxen_process_rxbuf(struct netxen_adapter *adapter, } else skb->ip_summed = CHECKSUM_NONE; - skb->dev = adapter->netdev; - buffer->skb = NULL; no_skb: buffer->state = NETXEN_BUFFER_FREE;