From 2406b2bba78a7a1f80cf45a82368a3bff1980a44 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Mon, 9 Jul 2012 14:09:31 +0000 Subject: [PATCH] --- yaml --- r: 315095 b: refs/heads/master c: c768b681f4d786721ad56e800358ddab2abb9af1 h: refs/heads/master i: 315093: b3de05df926df9ac4b1d45609bfd4506f1bcd743 315091: d688a5d423e9ebd0f11564306ae21dc01b10c032 315087: 298a03ce4da7963a72bb7b5fcfa4a4e57a2574c0 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/qlogic/qlge/qlge_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f7e42301167b..d475a76ed0bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad95dfc72a4be5c2b6914cfeca4592ddcd9ea8b5 +refs/heads/master: c768b681f4d786721ad56e800358ddab2abb9af1 diff --git a/trunk/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/trunk/drivers/net/ethernet/qlogic/qlge/qlge_main.c index 3c3499d928b9..ca427eb32369 100644 --- a/trunk/drivers/net/ethernet/qlogic/qlge/qlge_main.c +++ b/trunk/drivers/net/ethernet/qlogic/qlge/qlge_main.c @@ -1619,7 +1619,6 @@ static void ql_process_mac_rx_skb(struct ql_adapter *qdev, } prefetch(skb->data); - skb->dev = ndev; if (ib_mac_rsp->flags1 & IB_MAC_IOCB_RSP_M_MASK) { netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev, "%s Multicast.\n", @@ -1934,7 +1933,6 @@ static void ql_process_mac_split_rx_intr(struct ql_adapter *qdev, } prefetch(skb->data); - skb->dev = ndev; if (ib_mac_rsp->flags1 & IB_MAC_IOCB_RSP_M_MASK) { netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev, "%s Multicast.\n", (ib_mac_rsp->flags1 & IB_MAC_IOCB_RSP_M_MASK) ==