diff for duplicates of <1459335073.5907.34.camel@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index 24cb65e..adaa0ed 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,8 +4,8 @@ On Tue, 2016-03-29 at 15:04 +0800, Yisen Zhuang wrote: > The patch adds support of pause ctrl for HNS V2, and this feature is > lost > by HNS V1: -> ???????1) service ports can disable rx pause frame, -> ???????2) debug ports can open tx/rx pause frame. +> 1) service ports can disable rx pause frame, +> 2) debug ports can open tx/rx pause frame. > > And this patch updates the REGs about the pause ctrl when updated > status function called by upper layer routine. @@ -16,24 +16,24 @@ On Tue, 2016-03-29 at 15:04 +0800, Yisen Zhuang wrote: > +void hns_dsaf_get_rx_mac_pause_en(struct dsaf_device *dsaf_dev, int > mac_id, -> + ??u32 *en) +> + u32 *en) > +{ > + if (AE_IS_VER1(dsaf_dev->dsaf_ver)) > + *en = 1; -> ? else -> ? dsaf_write_dev(dsaf_dev, DSAF_PFC_EN_0_REG + mac_id +> else +> dsaf_write_dev(dsaf_dev, DSAF_PFC_EN_0_REG + mac_id > * 4, 0xff); > + *en = dsaf_get_dev_bit(dsaf_dev, -> + ???????DSAF_PAUSE_CFG_REG + mac_id * +> + DSAF_PAUSE_CFG_REG + mac_id * > 4, -> + ???????DSAF_MAC_PAUSE_RX_EN_B); +> + DSAF_MAC_PAUSE_RX_EN_B); And what the point of if branch then? I think it's an obvious misfix, you must replace else to } else { and add }. How did you test this part? -> ?} +> } -- diff --git a/a/content_digest b/N1/content_digest index 5603c02..7421ae8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,24 @@ "ref\01459235041-91766-1-git-send-email-Yisen.Zhuang@huawei.com\0" - "From\0andriy.shevchenko@linux.intel.com (Andy Shevchenko)\0" - "Subject\0[PATCH net-next] net: hns: add support of pause frame ctrl for HNS V2\0" + "From\0Andy Shevchenko <andriy.shevchenko@linux.intel.com>\0" + "Subject\0Re: [PATCH net-next] net: hns: add support of pause frame ctrl for HNS V2\0" "Date\0Wed, 30 Mar 2016 13:51:13 +0300\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Yisen Zhuang <Yisen.Zhuang@huawei.com>" + davem@davemloft.net + salil.mehta@huawei.com + liguozhu@huawei.com + huangdaode@hisilicon.com + arnd@arndb.de + andrew@lunn.ch + geliangtang@163.com + ivecera@redhat.com + lisheng011@huawei.com + " fengguang.wu@intel.com\0" + "Cc\0charles.chenxin@huawei.com" + haifeng.wei@huawei.com + netdev@vger.kernel.org + linux-kernel@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " linuxarm@huawei.com\0" "\00:1\0" "b\0" "On Tue, 2016-03-29 at 15:04 +0800, Yisen Zhuang wrote:\n" @@ -11,8 +27,8 @@ "> The patch adds support of pause ctrl for HNS V2, and this feature is\n" "> lost\n" "> by HNS V1:\n" - "> ???????1) service ports can disable rx pause frame,\n" - "> ???????2) debug ports can open tx/rx pause frame.\n" + "> \302\240\302\240\302\240\302\240\302\240\302\240\302\2401) service ports can disable rx pause frame,\n" + "> \302\240\302\240\302\240\302\240\302\240\302\240\302\2402) debug ports can open tx/rx pause frame.\n" "> \n" "> And this patch updates the REGs about the pause ctrl when updated\n" "> status function called by upper layer routine.\n" @@ -23,28 +39,28 @@ "\n" "> +void hns_dsaf_get_rx_mac_pause_en(struct dsaf_device *dsaf_dev, int\n" "> mac_id,\n" - "> +\t\t\t\t??u32 *en)\n" + "> +\t\t\t\t\302\240\302\240u32 *en)\n" "> +{\n" "> +\tif (AE_IS_VER1(dsaf_dev->dsaf_ver))\n" "> +\t\t*en = 1;\n" - "> ?\telse\n" - "> ?\t\tdsaf_write_dev(dsaf_dev, DSAF_PFC_EN_0_REG + mac_id\n" + "> \302\240\telse\n" + "> \302\240\t\tdsaf_write_dev(dsaf_dev, DSAF_PFC_EN_0_REG + mac_id\n" "> * 4, 0xff);\n" "> +\t\t*en = dsaf_get_dev_bit(dsaf_dev,\n" - "> +\t\t\t\t???????DSAF_PAUSE_CFG_REG + mac_id *\n" + "> +\t\t\t\t\302\240\302\240\302\240\302\240\302\240\302\240\302\240DSAF_PAUSE_CFG_REG + mac_id *\n" "> 4,\n" - "> +\t\t\t\t???????DSAF_MAC_PAUSE_RX_EN_B);\n" + "> +\t\t\t\t\302\240\302\240\302\240\302\240\302\240\302\240\302\240DSAF_MAC_PAUSE_RX_EN_B);\n" "\n" "And what the point of if branch then? I think it's an obvious misfix,\n" "you must replace else to } else { and add }.\n" "\n" "How did you test this part?\n" "\n" - "> ?}\n" + "> \302\240}\n" "\n" "\n" "-- \n" "Andy Shevchenko <andriy.shevchenko@linux.intel.com>\n" Intel Finland Oy -54ba4444c06b3e272b3f9f24bcc4c4a6bf17344708003af73baac61c8c2f3a4b +cd986b90e402b31ebd3011ddd7b74ec9fec7fe737691cf35fb70908ed626c434
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.