diff for duplicates of <1563041.H01PyFE9Xk@wasted.cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 4ec3d11..ec41a41 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -155,7 +155,8 @@ Changes in version 2: 5 files changed, 2691 insertions(+) Index: net-next/Documentation/devicetree/bindings/net/renesas,ravb.txt -=================================--- /dev/null +=================================================================== +--- /dev/null +++ net-next/Documentation/devicetree/bindings/net/renesas,ravb.txt @@ -0,0 +1,48 @@ +* Renesas Electronics Ethernet AVB @@ -207,7 +208,8 @@ Index: net-next/Documentation/devicetree/bindings/net/renesas,ravb.txt + }; + }; Index: net-next/drivers/net/ethernet/renesas/Kconfig -=================================--- net-next.orig/drivers/net/ethernet/renesas/Kconfig +=================================================================== +--- net-next.orig/drivers/net/ethernet/renesas/Kconfig +++ net-next/drivers/net/ethernet/renesas/Kconfig @@ -2,6 +2,21 @@ # Renesas device configuration @@ -252,7 +254,8 @@ Index: net-next/drivers/net/ethernet/renesas/Kconfig + +endif # NET_VENDOR_RENESAS Index: net-next/drivers/net/ethernet/renesas/Makefile -=================================--- net-next.orig/drivers/net/ethernet/renesas/Makefile +=================================================================== +--- net-next.orig/drivers/net/ethernet/renesas/Makefile +++ net-next/drivers/net/ethernet/renesas/Makefile @@ -3,3 +3,4 @@ # @@ -260,7 +263,8 @@ Index: net-next/drivers/net/ethernet/renesas/Makefile obj-$(CONFIG_SH_ETH) += sh_eth.o +obj-$(CONFIG_RAVB) += ravb.o Index: net-next/drivers/net/ethernet/renesas/ravb.c -=================================--- /dev/null +=================================================================== +--- /dev/null +++ net-next/drivers/net/ethernet/renesas/ravb.c @@ -0,0 +1,1805 @@ +/* Renesas Ethernet AVB device driver @@ -312,7 +316,7 @@ Index: net-next/drivers/net/ethernet/renesas/ravb.c + int i; + + for (i = 0; i < 10000; i++) { -+ if ((ravb_read(ndev, reg) & mask) = value) ++ if ((ravb_read(ndev, reg) & mask) == value) + return 0; + udelay(10); + } @@ -754,7 +758,7 @@ Index: net-next/drivers/net/ethernet/renesas/ravb.c + tag = ts_skb->tag; + list_del(&ts_skb->list); + kfree(ts_skb); -+ if (tag = tfa_tag) { ++ if (tag == tfa_tag) { + skb_tstamp_tx(skb, &shhwtstamps); + break; + } @@ -815,7 +819,7 @@ Index: net-next/drivers/net/ethernet/renesas/ravb.c + le32_to_cpu(desc->dptr), + ALIGN(PKT_BUF_SZ, 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) { @@ -830,7 +834,7 @@ Index: net-next/drivers/net/ethernet/renesas/ravb.c + } + 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); @@ -1230,7 +1234,7 @@ Index: net-next/drivers/net/ethernet/renesas/ravb.c + if (error) + goto error_exit; + -+ if (ecmd->duplex = DUPLEX_FULL) ++ if (ecmd->duplex == DUPLEX_FULL) + priv->duplex = 1; + else + priv->duplex = 0; @@ -1428,14 +1432,16 @@ Index: net-next/drivers/net/ethernet/renesas/ravb.c +static int ravb_get_ts_info(struct net_device *ndev, + struct ethtool_ts_info *info) +{ -+ 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 = -1; @@ -1573,7 +1579,7 @@ Index: net-next/drivers/net/ethernet/renesas/ravb.c + desc->dptr = cpu_to_le32(dma_addr); + + /* TX timestamp required */ -+ if (q = RAVB_NC) { ++ if (q == RAVB_NC) { + ts_skb = kmalloc(sizeof(*ts_skb), GFP_ATOMIC); + if (!ts_skb) { + dma_unmap_single(&ndev->dev, dma_addr, skb->len, @@ -1638,10 +1644,14 @@ Index: net-next/drivers/net/ethernet/renesas/ravb.c + nstats->multicast = stats0->multicast + stats1->multicast; + nstats->rx_errors = stats0->rx_errors + stats1->rx_errors; + nstats->rx_crc_errors = stats0->rx_crc_errors + stats1->rx_crc_errors; -+ nstats->rx_frame_errors + stats0->rx_frame_errors + stats1->rx_frame_errors; -+ nstats->rx_length_errors + stats0->rx_length_errors + stats1->rx_length_errors; -+ nstats->rx_missed_errors + stats0->rx_missed_errors + stats1->rx_missed_errors; -+ nstats->rx_over_errors + stats0->rx_over_errors + stats1->rx_over_errors; ++ nstats->rx_frame_errors = ++ stats0->rx_frame_errors + stats1->rx_frame_errors; ++ nstats->rx_length_errors = ++ stats0->rx_length_errors + stats1->rx_length_errors; ++ nstats->rx_missed_errors = ++ stats0->rx_missed_errors + stats1->rx_missed_errors; ++ nstats->rx_over_errors = ++ stats0->rx_over_errors + stats1->rx_over_errors; + + return nstats; +} @@ -1910,7 +1920,8 @@ Index: net-next/drivers/net/ethernet/renesas/ravb.c + priv->phy_interface = of_get_phy_mode(np); + + priv->no_avb_link = of_property_read_bool(np, "renesas,no-ether-link"); -+ priv->avb_link_active_low + of_property_read_bool(np, "renesas,ether-link-active-low"); ++ priv->avb_link_active_low = ++ of_property_read_bool(np, "renesas,ether-link-active-low"); + + /* Set function */ + ndev->netdev_ops = &ravb_netdev_ops; @@ -2062,7 +2073,8 @@ Index: net-next/drivers/net/ethernet/renesas/ravb.c +MODULE_DESCRIPTION("Renesas Ethernet AVB driver"); +MODULE_LICENSE("GPL v2"); Index: net-next/drivers/net/ethernet/renesas/ravb.h -=================================--- /dev/null +=================================================================== +--- /dev/null +++ net-next/drivers/net/ethernet/renesas/ravb.h @@ -0,0 +1,806 @@ +/* Renesas Ethernet AVB device driver diff --git a/a/content_digest b/N1/content_digest index c09ff4c..ffa8286 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0[PATCH v4 1/2] Renesas Ethernet AVB driver proper\0" - "Date\0Sun, 17 May 2015 20:52:42 +0000\0" + "Date\0Sun, 17 May 2015 23:52:42 +0300\0" "To\0robh+dt@kernel.org" pawel.moll@arm.com mark.rutland@arm.com @@ -170,7 +170,8 @@ " 5 files changed, 2691 insertions(+)\n" "\n" "Index: net-next/Documentation/devicetree/bindings/net/renesas,ravb.txt\n" - "=================================--- /dev/null\n" + "===================================================================\n" + "--- /dev/null\n" "+++ net-next/Documentation/devicetree/bindings/net/renesas,ravb.txt\n" "@@ -0,0 +1,48 @@\n" "+* Renesas Electronics Ethernet AVB\n" @@ -222,7 +223,8 @@ "+\t\t};\n" "+\t};\n" "Index: net-next/drivers/net/ethernet/renesas/Kconfig\n" - "=================================--- net-next.orig/drivers/net/ethernet/renesas/Kconfig\n" + "===================================================================\n" + "--- net-next.orig/drivers/net/ethernet/renesas/Kconfig\n" "+++ net-next/drivers/net/ethernet/renesas/Kconfig\n" "@@ -2,6 +2,21 @@\n" " # Renesas device configuration\n" @@ -267,7 +269,8 @@ "+\n" "+endif # NET_VENDOR_RENESAS\n" "Index: net-next/drivers/net/ethernet/renesas/Makefile\n" - "=================================--- net-next.orig/drivers/net/ethernet/renesas/Makefile\n" + "===================================================================\n" + "--- net-next.orig/drivers/net/ethernet/renesas/Makefile\n" "+++ net-next/drivers/net/ethernet/renesas/Makefile\n" "@@ -3,3 +3,4 @@\n" " #\n" @@ -275,7 +278,8 @@ " obj-$(CONFIG_SH_ETH) += sh_eth.o\n" "+obj-$(CONFIG_RAVB) += ravb.o\n" "Index: net-next/drivers/net/ethernet/renesas/ravb.c\n" - "=================================--- /dev/null\n" + "===================================================================\n" + "--- /dev/null\n" "+++ net-next/drivers/net/ethernet/renesas/ravb.c\n" "@@ -0,0 +1,1805 @@\n" "+/* Renesas Ethernet AVB device driver\n" @@ -327,7 +331,7 @@ "+\tint i;\n" "+\n" "+\tfor (i = 0; i < 10000; i++) {\n" - "+\t\tif ((ravb_read(ndev, reg) & mask) = value)\n" + "+\t\tif ((ravb_read(ndev, reg) & mask) == value)\n" "+\t\t\treturn 0;\n" "+\t\tudelay(10);\n" "+\t}\n" @@ -769,7 +773,7 @@ "+\t\t\ttag = ts_skb->tag;\n" "+\t\t\tlist_del(&ts_skb->list);\n" "+\t\t\tkfree(ts_skb);\n" - "+\t\t\tif (tag = tfa_tag) {\n" + "+\t\t\tif (tag == tfa_tag) {\n" "+\t\t\t\tskb_tstamp_tx(skb, &shhwtstamps);\n" "+\t\t\t\tbreak;\n" "+\t\t\t}\n" @@ -830,7 +834,7 @@ "+\t\t\t\t\t\tle32_to_cpu(desc->dptr),\n" "+\t\t\t\t\t\tALIGN(PKT_BUF_SZ, 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" @@ -845,7 +849,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" @@ -1245,7 +1249,7 @@ "+\tif (error)\n" "+\t\tgoto error_exit;\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" @@ -1443,14 +1447,16 @@ "+static int ravb_get_ts_info(struct net_device *ndev,\n" "+\t\t\t struct ethtool_ts_info *info)\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 = -1;\n" @@ -1588,7 +1594,7 @@ "+\tdesc->dptr = cpu_to_le32(dma_addr);\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\tdma_unmap_single(&ndev->dev, dma_addr, skb->len,\n" @@ -1653,10 +1659,14 @@ "+\tnstats->multicast = stats0->multicast + stats1->multicast;\n" "+\tnstats->rx_errors = stats0->rx_errors + stats1->rx_errors;\n" "+\tnstats->rx_crc_errors = stats0->rx_crc_errors + stats1->rx_crc_errors;\n" - "+\tnstats->rx_frame_errors +\t\tstats0->rx_frame_errors + stats1->rx_frame_errors;\n" - "+\tnstats->rx_length_errors +\t\tstats0->rx_length_errors + stats1->rx_length_errors;\n" - "+\tnstats->rx_missed_errors +\t\tstats0->rx_missed_errors + stats1->rx_missed_errors;\n" - "+\tnstats->rx_over_errors +\t\tstats0->rx_over_errors + stats1->rx_over_errors;\n" + "+\tnstats->rx_frame_errors =\n" + "+\t\tstats0->rx_frame_errors + stats1->rx_frame_errors;\n" + "+\tnstats->rx_length_errors =\n" + "+\t\tstats0->rx_length_errors + stats1->rx_length_errors;\n" + "+\tnstats->rx_missed_errors =\n" + "+\t\tstats0->rx_missed_errors + stats1->rx_missed_errors;\n" + "+\tnstats->rx_over_errors =\n" + "+\t\tstats0->rx_over_errors + stats1->rx_over_errors;\n" "+\n" "+\treturn nstats;\n" "+}\n" @@ -1925,7 +1935,8 @@ "+\tpriv->phy_interface = of_get_phy_mode(np);\n" "+\n" "+\tpriv->no_avb_link = of_property_read_bool(np, \"renesas,no-ether-link\");\n" - "+\tpriv->avb_link_active_low +\t\tof_property_read_bool(np, \"renesas,ether-link-active-low\");\n" + "+\tpriv->avb_link_active_low =\n" + "+\t\tof_property_read_bool(np, \"renesas,ether-link-active-low\");\n" "+\n" "+\t/* Set function */\n" "+\tndev->netdev_ops = &ravb_netdev_ops;\n" @@ -2077,7 +2088,8 @@ "+MODULE_DESCRIPTION(\"Renesas Ethernet AVB driver\");\n" "+MODULE_LICENSE(\"GPL v2\");\n" "Index: net-next/drivers/net/ethernet/renesas/ravb.h\n" - "=================================--- /dev/null\n" + "===================================================================\n" + "--- /dev/null\n" "+++ net-next/drivers/net/ethernet/renesas/ravb.h\n" "@@ -0,0 +1,806 @@\n" "+/* Renesas Ethernet AVB device driver\n" @@ -2887,4 +2899,4 @@ "+\n" "+#endif\t/* #ifndef __RAVB_H__ */" -d8364cd59c17c1f6a787a7a89d7999327b21b425252d8b8d06043993bdf1d2a9 +a3f01461206edeb0f226319164bd5f3e84dd934d2136a10bc8e02bcea73a9f1a
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.