diff for duplicates of <20160106095809.GC23185@mwanda> diff --git a/a/1.txt b/N1/1.txt index ba370ba..3e06286 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,7 +11,7 @@ index d78e2ba..587f9b4 100644 @@ -934,7 +934,7 @@ int dtsec_set_tx_pause_frames(struct fman_mac *dtsec, /* FM_BAD_TX_TS_IN_B_2_B_ERRATA_DTSEC_A003 Errata workaround */ - if (dtsec->fm_rev_info.major = 2) + if (dtsec->fm_rev_info.major == 2) - if (pause_time < 0 && pause_time <= 320) { + if (pause_time <= 320) { pr_warn("pause-time: %d illegal.Should be > 320\n", diff --git a/a/content_digest b/N1/content_digest index b36136d..8dd7a34 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch -next] fsl/fman: fix the pause_time test\0" - "Date\0Wed, 06 Jan 2016 09:58:09 +0000\0" + "Date\0Wed, 6 Jan 2016 12:58:09 +0300\0" "To\0Igal Liberman <igal.liberman@freescale.com>\0" "Cc\0David S. Miller <davem@davemloft.net>" netdev@vger.kernel.org @@ -20,11 +20,11 @@ "@@ -934,7 +934,7 @@ int dtsec_set_tx_pause_frames(struct fman_mac *dtsec,\n" " \n" " \t/* FM_BAD_TX_TS_IN_B_2_B_ERRATA_DTSEC_A003 Errata workaround */\n" - " \tif (dtsec->fm_rev_info.major = 2)\n" + " \tif (dtsec->fm_rev_info.major == 2)\n" "-\t\tif (pause_time < 0 && pause_time <= 320) {\n" "+\t\tif (pause_time <= 320) {\n" " \t\t\tpr_warn(\"pause-time: %d illegal.Should be > 320\\n\",\n" " \t\t\t\tpause_time);\n" " \t\t\treturn -EINVAL;" -e314bc1dfc0a7a8bd8c6c181448a277dc6a869b513c7907f8d0d2542347bd42c +e7236d0f0696210b36588b2c9c731ea3704572c212948ca2a4cfb8bcebc19049
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.