From: <Sathya.Perla@Emulex.Com> To: <sfr@canb.auug.org.au> Cc: <linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <Somnath.Kotur@Emulex.Com>, <davem@davemloft.net>, <netdev@vger.kernel.org> Subject: RE: linux-next: manual merge of the net tree with the net-current tree Date: Tue, 10 May 2011 04:55:36 -0700 [thread overview] Message-ID: <8473e76e-64b3-46bb-b4c3-7997f87d53ea@exht1.ad.emulex.com> (raw) In-Reply-To: <20110510114917.11f8738f.sfr@canb.auug.org.au> Hi Stephen, your conflict fix below looks fine. Thanks. -Sathya -----Original Message----- From: Stephen Rothwell [mailto:sfr@canb.auug.org.au] Sent: Tuesday, May 10, 2011 7:19 AM To: David Miller; netdev@vger.kernel.org Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Kotur, Somnath; Perla, Sathya Subject: linux-next: manual merge of the net tree with the net-current tree Hi all, Today's linux-next merge of the net tree got a conflict in drivers/net/benet/be_main.c between commit 6709d9521df0 ("be2net: Fixed bugs related to PVID") from the net-current tree and commit 15d721847f56 ("be2net: parse vid and vtm fields of rx-compl only if vlanf bit is set") from the net tree. I fixed it up (I think - see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc drivers/net/benet/be_main.c index 9187fb4,7b19931..0000000 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@@ -1103,9 -1102,14 +1104,14 @@@ static void be_parse_rx_compl_v1(struc AMAP_GET_BITS(struct amap_eth_rx_compl_v1, numfrags, compl); rxcp->pkt_type = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, cast_enc, compl); - rxcp->vtm = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vtm, compl); - rxcp->vlan_tag = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vlan_tag, - compl); + rxcp->rss_hash = + AMAP_GET_BITS(struct amap_eth_rx_compl_v1, rsshash, rxcp); + if (rxcp->vlanf) { + rxcp->vtm = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vtm, + compl); - rxcp->vid = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vlan_tag, ++ rxcp->vlan_tag = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vlan_tag, + compl); + } } static void be_parse_rx_compl_v0(struct be_adapter *adapter, @@@ -1130,9 -1134,14 +1136,14 @@@ AMAP_GET_BITS(struct amap_eth_rx_compl_v0, numfrags, compl); rxcp->pkt_type = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, cast_enc, compl); - rxcp->vtm = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vtm, compl); - rxcp->vlan_tag = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vlan_tag, - compl); + rxcp->rss_hash = + AMAP_GET_BITS(struct amap_eth_rx_compl_v0, rsshash, rxcp); + if (rxcp->vlanf) { + rxcp->vtm = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vtm, + compl); - rxcp->vid = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vlan_tag, ++ rxcp->vlan_tag = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vlan_tag, + compl); + } } static struct be_rx_compl_info *be_rx_compl_get(struct be_rx_obj *rxo) @@@ -1154,17 -1163,19 +1165,20 @@@ else be_parse_rx_compl_v0(adapter, compl, rxcp); - /* vlanf could be wrongly set in some cards. ignore if vtm is not set */ - if ((adapter->function_mode & 0x400) && !rxcp->vtm) - rxcp->vlanf = 0; + if (rxcp->vlanf) { + /* vlanf could be wrongly set in some cards. + * ignore if vtm is not set */ + if ((adapter->function_mode & 0x400) && !rxcp->vtm) + rxcp->vlanf = 0; - if (!lancer_chip(adapter)) - rxcp->vlan_tag = swab16(rxcp->vlan_tag); + if (!lancer_chip(adapter)) - rxcp->vid = swab16(rxcp->vid); ++ rxcp->vlan_tag = swab16(rxcp->vlan_tag); - if (((adapter->pvid & VLAN_VID_MASK) == - (rxcp->vlan_tag & VLAN_VID_MASK)) && - !adapter->vlan_tag[rxcp->vlan_tag]) - rxcp->vlanf = 0; - if ((adapter->pvid == rxcp->vid) && - !adapter->vlan_tag[rxcp->vid]) ++ if (((adapter->pvid & VLAN_VID_MASK) == ++ (rxcp->vlan_tag & VLAN_VID_MASK)) && ++ !adapter->vlan_tag[rxcp->vlan_tag]) + rxcp->vlanf = 0; + } /* As the compl has been parsed, reset it; we wont touch it again */ compl->dw[offsetof(struct amap_eth_rx_compl_v1, valid) / 32] = 0;
WARNING: multiple messages have this Message-ID (diff)
From: <Sathya.Perla@Emulex.Com> To: sfr@canb.auug.org.au Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Somnath.Kotur@Emulex.Com, davem@davemloft.net, netdev@vger.kernel.org Subject: RE: linux-next: manual merge of the net tree with the net-current tree Date: Tue, 10 May 2011 04:55:36 -0700 [thread overview] Message-ID: <8473e76e-64b3-46bb-b4c3-7997f87d53ea@exht1.ad.emulex.com> (raw) In-Reply-To: <20110510114917.11f8738f.sfr@canb.auug.org.au> Hi Stephen, your conflict fix below looks fine. Thanks. -Sathya -----Original Message----- From: Stephen Rothwell [mailto:sfr@canb.auug.org.au] Sent: Tuesday, May 10, 2011 7:19 AM To: David Miller; netdev@vger.kernel.org Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Kotur, Somnath; Perla, Sathya Subject: linux-next: manual merge of the net tree with the net-current tree Hi all, Today's linux-next merge of the net tree got a conflict in drivers/net/benet/be_main.c between commit 6709d9521df0 ("be2net: Fixed bugs related to PVID") from the net-current tree and commit 15d721847f56 ("be2net: parse vid and vtm fields of rx-compl only if vlanf bit is set") from the net tree. I fixed it up (I think - see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc drivers/net/benet/be_main.c index 9187fb4,7b19931..0000000 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@@ -1103,9 -1102,14 +1104,14 @@@ static void be_parse_rx_compl_v1(struc AMAP_GET_BITS(struct amap_eth_rx_compl_v1, numfrags, compl); rxcp->pkt_type = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, cast_enc, compl); - rxcp->vtm = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vtm, compl); - rxcp->vlan_tag = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vlan_tag, - compl); + rxcp->rss_hash = + AMAP_GET_BITS(struct amap_eth_rx_compl_v1, rsshash, rxcp); + if (rxcp->vlanf) { + rxcp->vtm = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vtm, + compl); - rxcp->vid = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vlan_tag, ++ rxcp->vlan_tag = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vlan_tag, + compl); + } } static void be_parse_rx_compl_v0(struct be_adapter *adapter, @@@ -1130,9 -1134,14 +1136,14 @@@ AMAP_GET_BITS(struct amap_eth_rx_compl_v0, numfrags, compl); rxcp->pkt_type = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, cast_enc, compl); - rxcp->vtm = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vtm, compl); - rxcp->vlan_tag = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vlan_tag, - compl); + rxcp->rss_hash = + AMAP_GET_BITS(struct amap_eth_rx_compl_v0, rsshash, rxcp); + if (rxcp->vlanf) { + rxcp->vtm = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vtm, + compl); - rxcp->vid = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vlan_tag, ++ rxcp->vlan_tag = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vlan_tag, + compl); + } } static struct be_rx_compl_info *be_rx_compl_get(struct be_rx_obj *rxo) @@@ -1154,17 -1163,19 +1165,20 @@@ else be_parse_rx_compl_v0(adapter, compl, rxcp); - /* vlanf could be wrongly set in some cards. ignore if vtm is not set */ - if ((adapter->function_mode & 0x400) && !rxcp->vtm) - rxcp->vlanf = 0; + if (rxcp->vlanf) { + /* vlanf could be wrongly set in some cards. + * ignore if vtm is not set */ + if ((adapter->function_mode & 0x400) && !rxcp->vtm) + rxcp->vlanf = 0; - if (!lancer_chip(adapter)) - rxcp->vlan_tag = swab16(rxcp->vlan_tag); + if (!lancer_chip(adapter)) - rxcp->vid = swab16(rxcp->vid); ++ rxcp->vlan_tag = swab16(rxcp->vlan_tag); - if (((adapter->pvid & VLAN_VID_MASK) == - (rxcp->vlan_tag & VLAN_VID_MASK)) && - !adapter->vlan_tag[rxcp->vlan_tag]) - rxcp->vlanf = 0; - if ((adapter->pvid == rxcp->vid) && - !adapter->vlan_tag[rxcp->vid]) ++ if (((adapter->pvid & VLAN_VID_MASK) == ++ (rxcp->vlan_tag & VLAN_VID_MASK)) && ++ !adapter->vlan_tag[rxcp->vlan_tag]) + rxcp->vlanf = 0; + } /* As the compl has been parsed, reset it; we wont touch it again */ compl->dw[offsetof(struct amap_eth_rx_compl_v1, valid) / 32] = 0;
next prev parent reply other threads:[~2011-05-10 11:56 UTC|newest] Thread overview: 116+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-05-10 1:49 linux-next: manual merge of the net tree with the net-current tree Stephen Rothwell 2011-05-10 1:49 ` Stephen Rothwell 2011-05-10 11:55 ` Sathya.Perla [this message] 2011-05-10 11:55 ` Sathya.Perla -- strict thread matches above, loose matches on Subject: below -- 2011-09-28 2:54 Stephen Rothwell 2011-09-28 2:54 ` Stephen Rothwell 2011-09-28 5:36 ` David Miller 2011-06-20 2:56 Stephen Rothwell 2011-06-20 2:56 ` Stephen Rothwell 2011-06-20 3:39 ` Simon Horman 2011-06-20 4:26 ` David Miller 2011-05-17 2:01 Stephen Rothwell 2011-05-17 2:01 ` Stephen Rothwell 2011-05-03 3:15 Stephen Rothwell 2011-05-03 3:15 ` Stephen Rothwell 2011-05-03 3:42 ` David Miller 2011-05-03 4:21 ` Stephen Rothwell 2011-04-19 3:16 Stephen Rothwell 2011-04-19 3:16 ` Stephen Rothwell 2011-04-19 7:41 ` David Miller 2011-04-07 1:39 Stephen Rothwell 2011-04-07 1:39 ` Stephen Rothwell 2011-04-07 20:48 ` David Miller 2011-03-08 3:09 Stephen Rothwell 2011-03-08 3:09 ` Stephen Rothwell 2011-03-08 9:44 ` Dmitry Kravkov 2011-03-09 0:11 ` Stephen Rothwell 2011-03-03 2:40 Stephen Rothwell 2011-03-03 2:40 ` Stephen Rothwell 2011-02-18 1:20 Stephen Rothwell 2011-02-18 1:20 ` Stephen Rothwell 2011-02-09 0:56 Stephen Rothwell 2011-02-09 0:56 ` Stephen Rothwell 2011-02-09 1:06 ` David Miller 2010-12-15 0:45 Stephen Rothwell 2010-12-15 0:45 ` Stephen Rothwell 2010-11-19 0:17 Stephen Rothwell 2010-11-19 0:17 ` Stephen Rothwell 2010-11-19 21:14 ` David Miller 2010-11-19 0:17 Stephen Rothwell 2010-11-19 0:17 ` Stephen Rothwell 2010-11-19 21:11 ` David Miller 2010-10-07 1:31 Stephen Rothwell 2010-10-07 1:31 ` Stephen Rothwell 2010-10-07 2:35 ` David Miller 2010-10-01 2:48 Stephen Rothwell 2010-10-01 2:48 ` Stephen Rothwell 2010-10-01 2:48 Stephen Rothwell 2010-10-01 2:48 ` Stephen Rothwell 2010-10-01 3:27 ` Jerry Chu 2010-10-05 5:47 ` David Miller 2010-09-23 2:14 Stephen Rothwell 2010-09-23 2:14 ` Stephen Rothwell 2010-08-02 1:04 Stephen Rothwell 2010-08-02 1:04 ` Stephen Rothwell 2010-08-02 1:04 ` Stephen Rothwell 2010-07-29 1:19 Stephen Rothwell 2010-07-29 1:19 ` Stephen Rothwell 2010-07-29 1:26 ` Jeff Kirsher 2010-07-29 1:26 ` Jeff Kirsher 2010-07-29 1:05 Stephen Rothwell 2010-07-29 1:05 ` Stephen Rothwell 2010-07-29 5:51 ` Jiri Pirko 2010-07-20 2:20 Stephen Rothwell 2010-07-20 2:20 ` Stephen Rothwell 2010-07-20 2:34 ` Joe Perches 2010-07-21 1:27 ` David Miller 2010-06-23 2:51 Stephen Rothwell 2010-06-23 2:51 ` Stephen Rothwell 2010-06-23 2:51 ` Stephen Rothwell 2010-06-23 4:14 ` Herbert Xu 2010-06-23 4:14 ` Herbert Xu 2010-06-25 18:22 ` David Miller 2010-06-25 18:22 ` David Miller 2010-06-15 2:00 Stephen Rothwell 2010-06-15 2:00 ` Stephen Rothwell 2009-11-24 3:11 Stephen Rothwell 2009-11-24 3:11 ` Stephen Rothwell 2009-11-30 1:12 ` David Miller 2009-11-24 3:11 Stephen Rothwell 2009-11-24 3:11 ` Stephen Rothwell 2009-11-25 7:52 ` Jeff Kirsher 2009-11-25 7:52 ` Jeff Kirsher 2009-11-30 1:11 ` David Miller 2009-11-30 2:46 ` Stephen Rothwell 2009-11-23 1:00 Stephen Rothwell 2009-11-23 1:00 ` Stephen Rothwell 2009-11-23 1:19 ` David Miller 2009-11-23 2:04 ` Stephen Rothwell 2009-11-23 2:11 ` David Miller 2009-11-23 1:00 Stephen Rothwell 2009-11-23 1:00 ` Stephen Rothwell 2009-11-23 18:09 ` Amit Salecha 2009-11-23 23:17 ` Stephen Rothwell 2009-11-17 2:16 Stephen Rothwell 2009-11-17 2:16 ` Stephen Rothwell 2009-11-17 8:00 ` Oliver Hartkopp 2009-11-17 8:16 ` Stephen Rothwell 2009-11-17 8:07 ` David Miller 2009-11-17 8:10 ` Stephen Rothwell 2009-11-09 2:03 Stephen Rothwell 2009-11-09 2:03 ` Stephen Rothwell 2009-11-09 4:59 ` David Miller 2009-11-06 0:55 Stephen Rothwell 2009-11-06 0:55 ` Stephen Rothwell 2009-11-06 1:40 ` David Miller 2009-11-06 2:32 ` Stephen Rothwell 2009-08-14 2:40 Stephen Rothwell 2009-08-14 2:50 ` David Miller 2009-08-14 4:19 ` Stephen Rothwell 2009-08-14 5:27 ` Dhananjay Phadke 2009-03-16 5:05 Stephen Rothwell 2009-03-16 6:41 ` Kirsher, Jeffrey T 2009-03-16 8:19 ` Stephen Rothwell 2009-02-12 2:46 Stephen Rothwell 2009-02-15 7:12 ` David Miller
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=8473e76e-64b3-46bb-b4c3-7997f87d53ea@exht1.ad.emulex.com \ --to=sathya.perla@emulex.com \ --cc=Somnath.Kotur@Emulex.Com \ --cc=davem@davemloft.net \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=netdev@vger.kernel.org \ --cc=sfr@canb.auug.org.au \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.