diff for duplicates of <552C4554.2070608@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 42a4330..2b7a4c9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -85,7 +85,7 @@ checked here? > + dma_sync_single_for_cpu(&ndev->dev, desc->dptr, > + ALIGN(priv->rx_buffer_size, 16), > + DMA_FROM_DEVICE); -> + get_ts &= (q = RAVB_NC) ? +> + get_ts &= (q == RAVB_NC) ? > + RAVB_RXTSTAMP_TYPE_V2_L2_EVENT : > + ~RAVB_RXTSTAMP_TYPE_V2_L2_EVENT; > + if (get_ts) { @@ -100,7 +100,7 @@ checked here? > + } > + skb_put(skb, pkt_len); > + skb->protocol = eth_type_trans(skb, ndev); -> + if (q = RAVB_NC) +> + if (q == RAVB_NC) > + netif_rx(skb); > + else > + netif_receive_skb(skb); @@ -161,7 +161,7 @@ This would be better moved to the NAPI handler. [snip] -> + if (ecmd->duplex = DUPLEX_FULL) +> + if (ecmd->duplex == DUPLEX_FULL) > + priv->duplex = 1; > + else > + priv->duplex = 0; @@ -387,14 +387,16 @@ the driver will work or accept an invalid PHY device at all anyway? > +{ > + struct ravb_private *priv = netdev_priv(ndev); > + -> + info->so_timestamping > + SOF_TIMESTAMPING_TX_SOFTWARE | +> + info->so_timestamping = +> + SOF_TIMESTAMPING_TX_SOFTWARE | > + SOF_TIMESTAMPING_RX_SOFTWARE | > + SOF_TIMESTAMPING_SOFTWARE | > + SOF_TIMESTAMPING_TX_HARDWARE | > + SOF_TIMESTAMPING_RX_HARDWARE | > + SOF_TIMESTAMPING_RAW_HARDWARE; > + info->tx_types = (1 << HWTSTAMP_TX_OFF) | (1 << HWTSTAMP_TX_ON); -> + info->rx_filters > + (1 << HWTSTAMP_FILTER_NONE) | +> + info->rx_filters = +> + (1 << HWTSTAMP_FILTER_NONE) | > + (1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) | > + (1 << HWTSTAMP_FILTER_ALL); > + info->phc_index = ptp_clock_index(priv->ptp.clock); @@ -571,7 +573,7 @@ Don't you need to make sure this NULL is properly seen by ravb_tx_free()? > + } > + > + /* TX timestamp required */ -> + if (q = RAVB_NC) { +> + if (q == RAVB_NC) { > + ts_skb = kmalloc(sizeof(*ts_skb), GFP_ATOMIC); > + if (!ts_skb) > + return -ENOMEM; diff --git a/a/content_digest b/N1/content_digest index d856241..9c11236 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\032501816.HtkLenWQpn@wasted.cogentembedded.com\0" "From\0Florian Fainelli <f.fainelli@gmail.com>\0" "Subject\0Re: [PATCH v3] Renesas Ethernet AVB driver\0" - "Date\0Mon, 13 Apr 2015 22:38:12 +0000\0" + "Date\0Mon, 13 Apr 2015 15:38:12 -0700\0" "To\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>" robh+dt@kernel.org pawel.moll@arm.com @@ -101,7 +101,7 @@ "> +\t\t\tdma_sync_single_for_cpu(&ndev->dev, desc->dptr,\n" "> +\t\t\t\t\t\tALIGN(priv->rx_buffer_size, 16),\n" "> +\t\t\t\t\t\tDMA_FROM_DEVICE);\n" - "> +\t\t\tget_ts &= (q = RAVB_NC) ?\n" + "> +\t\t\tget_ts &= (q == RAVB_NC) ?\n" "> +\t\t\t\t\tRAVB_RXTSTAMP_TYPE_V2_L2_EVENT :\n" "> +\t\t\t\t\t~RAVB_RXTSTAMP_TYPE_V2_L2_EVENT;\n" "> +\t\t\tif (get_ts) {\n" @@ -116,7 +116,7 @@ "> +\t\t\t}\n" "> +\t\t\tskb_put(skb, pkt_len);\n" "> +\t\t\tskb->protocol = eth_type_trans(skb, ndev);\n" - "> +\t\t\tif (q = RAVB_NC)\n" + "> +\t\t\tif (q == RAVB_NC)\n" "> +\t\t\t\tnetif_rx(skb);\n" "> +\t\t\telse\n" "> +\t\t\t\tnetif_receive_skb(skb);\n" @@ -177,7 +177,7 @@ "\n" "[snip]\n" "\n" - "> +\tif (ecmd->duplex = DUPLEX_FULL)\n" + "> +\tif (ecmd->duplex == DUPLEX_FULL)\n" "> +\t\tpriv->duplex = 1;\n" "> +\telse\n" "> +\t\tpriv->duplex = 0;\n" @@ -403,14 +403,16 @@ "> +{\n" "> +\tstruct ravb_private *priv = netdev_priv(ndev);\n" "> +\n" - "> +\tinfo->so_timestamping > +\t\tSOF_TIMESTAMPING_TX_SOFTWARE |\n" + "> +\tinfo->so_timestamping =\n" + "> +\t\tSOF_TIMESTAMPING_TX_SOFTWARE |\n" "> +\t\tSOF_TIMESTAMPING_RX_SOFTWARE |\n" "> +\t\tSOF_TIMESTAMPING_SOFTWARE |\n" "> +\t\tSOF_TIMESTAMPING_TX_HARDWARE |\n" "> +\t\tSOF_TIMESTAMPING_RX_HARDWARE |\n" "> +\t\tSOF_TIMESTAMPING_RAW_HARDWARE;\n" "> +\tinfo->tx_types = (1 << HWTSTAMP_TX_OFF) | (1 << HWTSTAMP_TX_ON);\n" - "> +\tinfo->rx_filters > +\t\t(1 << HWTSTAMP_FILTER_NONE) |\n" + "> +\tinfo->rx_filters =\n" + "> +\t\t(1 << HWTSTAMP_FILTER_NONE) |\n" "> +\t\t(1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |\n" "> +\t\t(1 << HWTSTAMP_FILTER_ALL);\n" "> +\tinfo->phc_index = ptp_clock_index(priv->ptp.clock);\n" @@ -587,7 +589,7 @@ "> +\t}\n" "> +\n" "> +\t/* TX timestamp required */\n" - "> +\tif (q = RAVB_NC) {\n" + "> +\tif (q == RAVB_NC) {\n" "> +\t\tts_skb = kmalloc(sizeof(*ts_skb), GFP_ATOMIC);\n" "> +\t\tif (!ts_skb)\n" "> +\t\t\treturn -ENOMEM;\n" @@ -618,4 +620,4 @@ "-- \n" Florian -3d6346f78c674eca12308c2997293184560dc6c89b9e5696370f79ee1c90a67c +35c2568c40de2f604882993b4f275b805840066638881ff57989d8abfbe5fb89
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.