From patchwork Mon Aug 23 18:10:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Christoph Lameter (Ampere)" X-Patchwork-Id: 125031 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7NIAo7P012228 for ; Mon, 23 Aug 2010 18:10:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751729Ab0HWSKs (ORCPT ); Mon, 23 Aug 2010 14:10:48 -0400 Received: from smtp107.prem.mail.ac4.yahoo.com ([76.13.13.46]:25092 "HELO smtp107.prem.mail.ac4.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751397Ab0HWSKs (ORCPT ); Mon, 23 Aug 2010 14:10:48 -0400 Received: (qmail 93482 invoked from network); 23 Aug 2010 18:10:47 -0000 Received: from router.home (cl@99.30.10.212 with plain) by smtp107.prem.mail.ac4.yahoo.com with SMTP; 23 Aug 2010 11:10:47 -0700 PDT X-Yahoo-SMTP: _Dag8S.swBC1p4FJKLCXbs8NQzyse1SYSgnAbY0- X-YMail-OSG: XKhxedQVM1kMGV6KW9OONOSXJTXv5WKi8ypcHdkJKX8pvrR KMPo52_n7A0ibMCZECm1Yw4DnuuMqIhPzPRNINeyLmegGiPeRUSnozZ4Fs24 9LL0uNOeWoeQD8R2tX2KOEwHcG59vkL8_83HEBFPpjJcZRzoyI1FMTcafkFI xvLjufaD.Fjya4adn6ezTULFLR8MAA9oF0h4_Cf.mX9y2nmPCGk1aNIl6gaV dH_n1foilWpOSLW.0HRFiNJYC9bT_JLpabQ-- X-Yahoo-Newman-Property: ymail-3 Received: from cl (helo=localhost) by router.home with local-esmtp (Exim 4.71) (envelope-from ) id 1OnbTq-0002zA-K0; Mon, 23 Aug 2010 13:10:46 -0500 Date: Mon, 23 Aug 2010 13:10:45 -0500 (CDT) From: Christoph Lameter X-X-Sender: cl@router.home To: Jason Gunthorpe cc: linux-rdma@vger.kernel.org, Or Gerlitz , Yossi Etigin , Roland Dreier Subject: Re: IPoIB: Broken IGMP processing In-Reply-To: <20100823174110.GK26549@obsidianresearch.com> Message-ID: References: <20100823174110.GK26549@obsidianresearch.com> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 23 Aug 2010 18:10:50 +0000 (UTC) Index: linux-2.6/drivers/infiniband/ulp/ipoib/ipoib_ib.c =================================================================== --- linux-2.6.orig/drivers/infiniband/ulp/ipoib/ipoib_ib.c 2010-08-23 13:07:32.000000000 -0500 +++ linux-2.6/drivers/infiniband/ulp/ipoib/ipoib_ib.c 2010-08-23 13:09:06.000000000 -0500 @@ -223,6 +223,7 @@ static void ipoib_ib_handle_rx_wc(struct unsigned int wr_id = wc->wr_id & ~IPOIB_OP_RECV; struct sk_buff *skb; u64 mapping[IPOIB_UD_RX_SG]; + struct ipoib_dev_priv *multicast_priv = netdev_priv(priv->broadcast->dev); ipoib_dbg_data(priv, "recv completion: id %d, status: %d\n", wr_id, wc->status); @@ -281,8 +282,11 @@ static void ipoib_ib_handle_rx_wc(struct dev->stats.rx_bytes += skb->len; skb->dev = dev; - /* XXX get correct PACKET_ type here */ - skb->pkt_type = PACKET_HOST; + if (wc->src_qp == multicast_priv->qp->qp_num) + + skb->pkt_type = PACKET_MULTICAST; + else + skb->pkt_type = PACKET_HOST; if (test_bit(IPOIB_FLAG_CSUM, &priv->flags) && likely(wc->csum_ok)) skb->ip_summed = CHECKSUM_UNNECESSARY;