From patchwork Sat Dec 31 03:30:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Zumbiehl X-Patchwork-Id: 133714 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EEC95B6FC9 for ; Sat, 31 Dec 2011 14:30:41 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752631Ab1LaDaT (ORCPT ); Fri, 30 Dec 2011 22:30:19 -0500 Received: from rain.florz.de ([62.216.164.86]:43105 "EHLO rain.florz.dyndns.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751926Ab1LaDaS (ORCPT ); Fri, 30 Dec 2011 22:30:18 -0500 Received: from florz.florz.dyndns.org ([192.168.0.121]) by rain.florz.dyndns.org with esmtp (Exim 4.69) (envelope-from ) id 1Rgpe6-0000dP-7O; Sat, 31 Dec 2011 04:30:10 +0100 Received: from florz by florz.florz.dyndns.org with local (Exim 4.72) (envelope-from ) id 1Rgpe5-00049s-Vi; Sat, 31 Dec 2011 04:30:10 +0100 Date: Sat, 31 Dec 2011 04:30:09 +0100 From: Florian Zumbiehl To: netdev@vger.kernel.org, shemminger@linux-foundation.org, davem@davemloft.net Subject: [PATCH 3.2-rc7] skge: restore rx multicast filter on resume and after config changes Message-ID: <20111231033009.GE2698@florz.florz.dyndns.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Restore skge hardware registers for multicast filtering to their appropriate values after system resume and after hardware restarts that are done when changing certain settings. Signed-off-by: Florian Zumbiehl Acked-by: Stephen Hemminger --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c index c7b6083..dea0cb4 100644 --- a/drivers/net/ethernet/marvell/skge.c +++ b/drivers/net/ethernet/marvell/skge.c @@ -2606,6 +2606,9 @@ static int skge_up(struct net_device *dev) spin_unlock_irq(&hw->hw_lock); napi_enable(&skge->napi); + + skge_set_multicast(dev); + return 0; free_tx_ring: