diff for duplicates of <11181019443007@foobar.com> diff --git a/a/1.txt b/N1/1.txt index da6ec58..370f588 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,13 +5,10 @@ Signed-off-by: Matt Porter <mporter@kernel.crashing.org> commit d651f0979ebfb203624159507a2b04ac896844ab tree c9dffe54b25b6992025f074de1fe9901adc8d6ef parent 7cfb63a2fce0dbb82507bb6035352df1718624f2 -author Matt Porter <mporter@kernel.crashing.org> Mon, 06 Jun 2005 13:57:52 = --0700 -committer Matt Porter <mporter@kernel.crashing.org> Mon, 06 Jun 2005 13:57:= -52 -0700 +author Matt Porter <mporter@kernel.crashing.org> Mon, 06 Jun 2005 13:57:52 -0700 +committer Matt Porter <mporter@kernel.crashing.org> Mon, 06 Jun 2005 13:57:52 -0700 - drivers/net/rionet.c | 73 ++++++++++++++++------------------------------= ----- + drivers/net/rionet.c | 73 ++++++++++++++++---------------------------------- 1 files changed, 24 insertions(+), 49 deletions(-) diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c @@ -20,10 +17,10 @@ diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c @@ -42,7 +42,7 @@ MODULE_LICENSE("GPL"); #define RIONET_TX_RING_SIZE CONFIG_RIONET_TX_SIZE #define RIONET_RX_RING_SIZE CONFIG_RIONET_RX_SIZE -=20 + -LIST_HEAD(rionet_peers); +static LIST_HEAD(rionet_peers); -=20 + struct rionet_private { struct rio_mport *mport; @@ -54,6 +54,7 @@ struct rionet_private { @@ -33,25 +30,25 @@ diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c + spinlock_t tx_lock; u32 msg_enable; }; -=20 + @@ -112,9 +113,9 @@ static int rionet_rx_clean(struct net_de -=20 - rnet->rx_skb[i]->data =3D data; + + rnet->rx_skb[i]->data = data; skb_put(rnet->rx_skb[i], RIO_MAX_MSG_SIZE); -- rnet->rx_skb[i]->dev =3D sndev; -+ rnet->rx_skb[i]->dev =3D ndev; - rnet->rx_skb[i]->protocol =3D +- rnet->rx_skb[i]->dev = sndev; ++ rnet->rx_skb[i]->dev = ndev; + rnet->rx_skb[i]->protocol = - eth_type_trans(rnet->rx_skb[i], sndev); + eth_type_trans(rnet->rx_skb[i], ndev); - error =3D netif_rx(rnet->rx_skb[i]); -=20 - if (error =3D=3D NET_RX_DROP) { + error = netif_rx(rnet->rx_skb[i]); + + if (error == NET_RX_DROP) { @@ -183,13 +184,20 @@ static int rionet_start_xmit(struct sk_b - struct rionet_private *rnet =3D ndev->priv; - struct ethhdr *eth =3D (struct ethhdr *)skb->data; + struct rionet_private *rnet = ndev->priv; + struct ethhdr *eth = (struct ethhdr *)skb->data; u16 destid; + unsigned long flags; -=20 + - spin_lock_irq(&rnet->lock); - + local_irq_save(flags); @@ -59,7 +56,7 @@ diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c + local_irq_restore(flags); + return NETDEV_TX_LOCKED; + } -+=09 ++ if ((rnet->tx_cnt + 1) > RIONET_TX_RING_SIZE) { netif_stop_queue(ndev); - spin_unlock_irq(&rnet->lock); @@ -69,24 +66,24 @@ diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c + ndev->name); + return NETDEV_TX_BUSY; } -=20 + if (eth->h_dest[0] & 0x01) { @@ -211,7 +219,7 @@ static int rionet_start_xmit(struct sk_b rionet_queue_tx_msg(skb, ndev, rionet_active[destid]); } -=20 + - spin_unlock_irq(&rnet->lock); + spin_unlock_irqrestore(&rnet->tx_lock, flags); -=20 + return 0; } @@ -228,27 +236,6 @@ static int rionet_set_mac_address(struct return 0; } -=20 + -static int rionet_change_mtu(struct net_device *ndev, int new_mtu) -{ -- struct rionet_private *rnet =3D ndev->priv; +- struct rionet_private *rnet = ndev->priv; - - if (netif_msg_drv(rnet)) - printk(KERN_WARNING @@ -97,7 +94,7 @@ diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c - -static void rionet_set_multicast_list(struct net_device *ndev) -{ -- struct rionet_private *rnet =3D ndev->priv; +- struct rionet_private *rnet = ndev->priv; - - if (netif_msg_drv(rnet)) - printk(KERN_WARNING @@ -109,20 +106,20 @@ diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c u16 info) { @@ -358,10 +345,6 @@ static int rionet_open(struct net_device - rnet->tx_cnt =3D 0; - rnet->ack_slot =3D 0; -=20 + rnet->tx_cnt = 0; + rnet->ack_slot = 0; + - spin_lock_init(&rnet->lock); - -- rnet->msg_enable =3D RIONET_DEFAULT_MSGLEVEL; +- rnet->msg_enable = RIONET_DEFAULT_MSGLEVEL; - netif_carrier_on(ndev); netif_start_queue(ndev); -=20 + @@ -434,11 +417,6 @@ static void rionet_remove(struct rio_dev } } -=20 + -static int rionet_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd) -{ - return -EOPNOTSUPP; @@ -132,44 +129,44 @@ diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c struct ethtool_drvinfo *info) { @@ -464,16 +442,11 @@ static void rionet_set_msglevel(struct n - rnet->msg_enable =3D value; + rnet->msg_enable = value; } -=20 + -static u32 rionet_get_link(struct net_device *ndev) -{ - return netif_carrier_ok(ndev); -} - - static struct ethtool_ops rionet_ethtool_ops =3D { - .get_drvinfo =3D rionet_get_drvinfo, - .get_msglevel =3D rionet_get_msglevel, - .set_msglevel =3D rionet_set_msglevel, -- .get_link =3D rionet_get_link, -+ .get_link =3D ethtool_op_get_link, + static struct ethtool_ops rionet_ethtool_ops = { + .get_drvinfo = rionet_get_drvinfo, + .get_msglevel = rionet_get_msglevel, + .set_msglevel = rionet_set_msglevel, +- .get_link = rionet_get_link, ++ .get_link = ethtool_op_get_link, }; -=20 + static int rionet_setup_netdev(struct rio_mport *mport) @@ -517,16 +490,18 @@ static int rionet_setup_netdev(struct ri - ndev->hard_start_xmit =3D &rionet_start_xmit; - ndev->stop =3D &rionet_close; - ndev->get_stats =3D &rionet_stats; -- ndev->change_mtu =3D &rionet_change_mtu; - ndev->set_mac_address =3D &rionet_set_mac_address; -- ndev->set_multicast_list =3D &rionet_set_multicast_list; -- ndev->do_ioctl =3D &rionet_ioctl; + ndev->hard_start_xmit = &rionet_start_xmit; + ndev->stop = &rionet_close; + ndev->get_stats = &rionet_stats; +- ndev->change_mtu = &rionet_change_mtu; + ndev->set_mac_address = &rionet_set_mac_address; +- ndev->set_multicast_list = &rionet_set_multicast_list; +- ndev->do_ioctl = &rionet_ioctl; - SET_ETHTOOL_OPS(ndev, &rionet_ethtool_ops); - - ndev->mtu =3D RIO_MAX_MSG_SIZE - 14; -+ ndev->features =3D NETIF_F_LLTX; + ndev->mtu = RIO_MAX_MSG_SIZE - 14; ++ ndev->features = NETIF_F_LLTX; + SET_ETHTOOL_OPS(ndev, &rionet_ethtool_ops); -=20 + SET_MODULE_OWNER(ndev); -=20 + + spin_lock_init(&rnet->lock); + spin_lock_init(&rnet->tx_lock); + -+ rnet->msg_enable =3D RIONET_DEFAULT_MSGLEVEL; ++ rnet->msg_enable = RIONET_DEFAULT_MSGLEVEL; + - rc =3D register_netdev(ndev); - if (rc !=3D 0) + rc = register_netdev(ndev); + if (rc != 0) goto out; diff --git a/a/content_digest b/N1/content_digest index c779a78..d737b73 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -14,13 +14,10 @@ "commit d651f0979ebfb203624159507a2b04ac896844ab\n" "tree c9dffe54b25b6992025f074de1fe9901adc8d6ef\n" "parent 7cfb63a2fce0dbb82507bb6035352df1718624f2\n" - "author Matt Porter <mporter@kernel.crashing.org> Mon, 06 Jun 2005 13:57:52 =\n" - "-0700\n" - "committer Matt Porter <mporter@kernel.crashing.org> Mon, 06 Jun 2005 13:57:=\n" - "52 -0700\n" + "author Matt Porter <mporter@kernel.crashing.org> Mon, 06 Jun 2005 13:57:52 -0700\n" + "committer Matt Porter <mporter@kernel.crashing.org> Mon, 06 Jun 2005 13:57:52 -0700\n" "\n" - " drivers/net/rionet.c | 73 ++++++++++++++++------------------------------=\n" - "----\n" + " drivers/net/rionet.c | 73 ++++++++++++++++----------------------------------\n" " 1 files changed, 24 insertions(+), 49 deletions(-)\n" "\n" "diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c\n" @@ -29,10 +26,10 @@ "@@ -42,7 +42,7 @@ MODULE_LICENSE(\"GPL\");\n" " #define RIONET_TX_RING_SIZE\tCONFIG_RIONET_TX_SIZE\n" " #define RIONET_RX_RING_SIZE\tCONFIG_RIONET_RX_SIZE\n" - "=20\n" + " \n" "-LIST_HEAD(rionet_peers);\n" "+static LIST_HEAD(rionet_peers);\n" - "=20\n" + " \n" " struct rionet_private {\n" " \tstruct rio_mport *mport;\n" "@@ -54,6 +54,7 @@ struct rionet_private {\n" @@ -42,25 +39,25 @@ "+\tspinlock_t tx_lock;\n" " \tu32 msg_enable;\n" " };\n" - "=20\n" + " \n" "@@ -112,9 +113,9 @@ static int rionet_rx_clean(struct net_de\n" - "=20\n" - " \t\trnet->rx_skb[i]->data =3D data;\n" + " \n" + " \t\trnet->rx_skb[i]->data = data;\n" " \t\tskb_put(rnet->rx_skb[i], RIO_MAX_MSG_SIZE);\n" - "-\t\trnet->rx_skb[i]->dev =3D sndev;\n" - "+\t\trnet->rx_skb[i]->dev =3D ndev;\n" - " \t\trnet->rx_skb[i]->protocol =3D\n" + "-\t\trnet->rx_skb[i]->dev = sndev;\n" + "+\t\trnet->rx_skb[i]->dev = ndev;\n" + " \t\trnet->rx_skb[i]->protocol =\n" "-\t\t eth_type_trans(rnet->rx_skb[i], sndev);\n" "+\t\t eth_type_trans(rnet->rx_skb[i], ndev);\n" - " \t\terror =3D netif_rx(rnet->rx_skb[i]);\n" - "=20\n" - " \t\tif (error =3D=3D NET_RX_DROP) {\n" + " \t\terror = netif_rx(rnet->rx_skb[i]);\n" + " \n" + " \t\tif (error == NET_RX_DROP) {\n" "@@ -183,13 +184,20 @@ static int rionet_start_xmit(struct sk_b\n" - " \tstruct rionet_private *rnet =3D ndev->priv;\n" - " \tstruct ethhdr *eth =3D (struct ethhdr *)skb->data;\n" + " \tstruct rionet_private *rnet = ndev->priv;\n" + " \tstruct ethhdr *eth = (struct ethhdr *)skb->data;\n" " \tu16 destid;\n" "+\tunsigned long flags;\n" - "=20\n" + " \n" "-\tspin_lock_irq(&rnet->lock);\n" "-\n" "+\tlocal_irq_save(flags);\n" @@ -68,7 +65,7 @@ "+\t\tlocal_irq_restore(flags);\n" "+\t\treturn NETDEV_TX_LOCKED;\n" "+\t}\n" - "+=09\n" + "+\t\n" " \tif ((rnet->tx_cnt + 1) > RIONET_TX_RING_SIZE) {\n" " \t\tnetif_stop_queue(ndev);\n" "-\t\tspin_unlock_irq(&rnet->lock);\n" @@ -78,24 +75,24 @@ "+\t\t ndev->name);\n" "+\t\treturn NETDEV_TX_BUSY;\n" " \t}\n" - "=20\n" + " \n" " \tif (eth->h_dest[0] & 0x01) {\n" "@@ -211,7 +219,7 @@ static int rionet_start_xmit(struct sk_b\n" " \t\t\trionet_queue_tx_msg(skb, ndev, rionet_active[destid]);\n" " \t}\n" - "=20\n" + " \n" "-\tspin_unlock_irq(&rnet->lock);\n" "+\tspin_unlock_irqrestore(&rnet->tx_lock, flags);\n" - "=20\n" + " \n" " \treturn 0;\n" " }\n" "@@ -228,27 +236,6 @@ static int rionet_set_mac_address(struct\n" " \treturn 0;\n" " }\n" - "=20\n" + " \n" "-static int rionet_change_mtu(struct net_device *ndev, int new_mtu)\n" "-{\n" - "-\tstruct rionet_private *rnet =3D ndev->priv;\n" + "-\tstruct rionet_private *rnet = ndev->priv;\n" "-\n" "-\tif (netif_msg_drv(rnet))\n" "-\t\tprintk(KERN_WARNING\n" @@ -106,7 +103,7 @@ "-\n" "-static void rionet_set_multicast_list(struct net_device *ndev)\n" "-{\n" - "-\tstruct rionet_private *rnet =3D ndev->priv;\n" + "-\tstruct rionet_private *rnet = ndev->priv;\n" "-\n" "-\tif (netif_msg_drv(rnet))\n" "-\t\tprintk(KERN_WARNING\n" @@ -118,20 +115,20 @@ " \t\t\t u16 info)\n" " {\n" "@@ -358,10 +345,6 @@ static int rionet_open(struct net_device\n" - " \trnet->tx_cnt =3D 0;\n" - " \trnet->ack_slot =3D 0;\n" - "=20\n" + " \trnet->tx_cnt = 0;\n" + " \trnet->ack_slot = 0;\n" + " \n" "-\tspin_lock_init(&rnet->lock);\n" "-\n" - "-\trnet->msg_enable =3D RIONET_DEFAULT_MSGLEVEL;\n" + "-\trnet->msg_enable = RIONET_DEFAULT_MSGLEVEL;\n" "-\n" " \tnetif_carrier_on(ndev);\n" " \tnetif_start_queue(ndev);\n" - "=20\n" + " \n" "@@ -434,11 +417,6 @@ static void rionet_remove(struct rio_dev\n" " \t}\n" " }\n" - "=20\n" + " \n" "-static int rionet_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)\n" "-{\n" "-\treturn -EOPNOTSUPP;\n" @@ -141,46 +138,46 @@ " \t\t\t struct ethtool_drvinfo *info)\n" " {\n" "@@ -464,16 +442,11 @@ static void rionet_set_msglevel(struct n\n" - " \trnet->msg_enable =3D value;\n" + " \trnet->msg_enable = value;\n" " }\n" - "=20\n" + " \n" "-static u32 rionet_get_link(struct net_device *ndev)\n" "-{\n" "-\treturn netif_carrier_ok(ndev);\n" "-}\n" "-\n" - " static struct ethtool_ops rionet_ethtool_ops =3D {\n" - " \t.get_drvinfo =3D rionet_get_drvinfo,\n" - " \t.get_msglevel =3D rionet_get_msglevel,\n" - " \t.set_msglevel =3D rionet_set_msglevel,\n" - "-\t.get_link =3D rionet_get_link,\n" - "+\t.get_link =3D ethtool_op_get_link,\n" + " static struct ethtool_ops rionet_ethtool_ops = {\n" + " \t.get_drvinfo = rionet_get_drvinfo,\n" + " \t.get_msglevel = rionet_get_msglevel,\n" + " \t.set_msglevel = rionet_set_msglevel,\n" + "-\t.get_link = rionet_get_link,\n" + "+\t.get_link = ethtool_op_get_link,\n" " };\n" - "=20\n" + " \n" " static int rionet_setup_netdev(struct rio_mport *mport)\n" "@@ -517,16 +490,18 @@ static int rionet_setup_netdev(struct ri\n" - " \tndev->hard_start_xmit =3D &rionet_start_xmit;\n" - " \tndev->stop =3D &rionet_close;\n" - " \tndev->get_stats =3D &rionet_stats;\n" - "-\tndev->change_mtu =3D &rionet_change_mtu;\n" - " \tndev->set_mac_address =3D &rionet_set_mac_address;\n" - "-\tndev->set_multicast_list =3D &rionet_set_multicast_list;\n" - "-\tndev->do_ioctl =3D &rionet_ioctl;\n" + " \tndev->hard_start_xmit = &rionet_start_xmit;\n" + " \tndev->stop = &rionet_close;\n" + " \tndev->get_stats = &rionet_stats;\n" + "-\tndev->change_mtu = &rionet_change_mtu;\n" + " \tndev->set_mac_address = &rionet_set_mac_address;\n" + "-\tndev->set_multicast_list = &rionet_set_multicast_list;\n" + "-\tndev->do_ioctl = &rionet_ioctl;\n" "-\tSET_ETHTOOL_OPS(ndev, &rionet_ethtool_ops);\n" "-\n" - " \tndev->mtu =3D RIO_MAX_MSG_SIZE - 14;\n" - "+\tndev->features =3D NETIF_F_LLTX;\n" + " \tndev->mtu = RIO_MAX_MSG_SIZE - 14;\n" + "+\tndev->features = NETIF_F_LLTX;\n" "+\tSET_ETHTOOL_OPS(ndev, &rionet_ethtool_ops);\n" - "=20\n" + " \n" " \tSET_MODULE_OWNER(ndev);\n" - "=20\n" + " \n" "+\tspin_lock_init(&rnet->lock);\n" "+\tspin_lock_init(&rnet->tx_lock);\n" "+\n" - "+\trnet->msg_enable =3D RIONET_DEFAULT_MSGLEVEL;\n" + "+\trnet->msg_enable = RIONET_DEFAULT_MSGLEVEL;\n" "+\n" - " \trc =3D register_netdev(ndev);\n" - " \tif (rc !=3D 0)\n" + " \trc = register_netdev(ndev);\n" + " \tif (rc != 0)\n" " \t\tgoto out;" -6dfa8d11984f9d284796f0a387872522c1655d73db7ec292a8ba66acadf7324a +d1f0250eb8a85384856d3690c1282ab44ee12c85a82dc7ba129b9e663c6bdaee
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.