diff for duplicates of <1118097615222@foobar.com> diff --git a/a/1.txt b/N1/1.txt index 0bdf99f..e2ccc15 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,7 +10,7 @@ diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig @@ -2185,6 +2185,20 @@ config ISERIES_VETH tristate "iSeries Virtual Ethernet driver support" depends on NETDEVICES && PPC_ISERIES -=20 + +config RIONET + tristate "RapidIO Ethernet over messaging driver support" + depends on NETDEVICES && RAPIDIO @@ -31,12 +31,12 @@ diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig diff --git a/drivers/net/Makefile b/drivers/net/Makefile --- a/drivers/net/Makefile +++ b/drivers/net/Makefile -@@ -58,6 +58,7 @@ obj-$(CONFIG_SKFP) +=3D skfp/ - obj-$(CONFIG_VIA_RHINE) +=3D via-rhine.o - obj-$(CONFIG_VIA_VELOCITY) +=3D via-velocity.o - obj-$(CONFIG_ADAPTEC_STARFIRE) +=3D starfire.o -+obj-$(CONFIG_RIONET) +=3D rionet.o -=20 +@@ -58,6 +58,7 @@ obj-$(CONFIG_SKFP) += skfp/ + obj-$(CONFIG_VIA_RHINE) += via-rhine.o + obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o + obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o ++obj-$(CONFIG_RIONET) += rionet.o + # # end link order section diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c @@ -110,9 +110,9 @@ new file mode 100644 + struct resource *res; +}; + -+static int rionet_check =3D 0; -+static int rionet_capable =3D 1; -+static struct net_device *sndev =3D NULL; ++static int rionet_check = 0; ++static int rionet_capable = 1; ++static struct net_device *sndev = NULL; + +/* + * This is a fast lookup table for for translating TX @@ -130,23 +130,23 @@ new file mode 100644 +#define dev_rionet_capable(dev) \ + is_rionet_capable(dev->pef, dev->src_ops, dev->dst_ops) + -+#define RIONET_MAC_MATCH(x) (*(u32 *)x =3D=3D 0x00010001) ++#define RIONET_MAC_MATCH(x) (*(u32 *)x == 0x00010001) +#define RIONET_GET_DESTID(x) (*(u16 *)(x + 4)) + +static struct net_device_stats *rionet_stats(struct net_device *ndev) +{ -+ struct rionet_private *rnet =3D ndev->priv; ++ struct rionet_private *rnet = ndev->priv; + return &rnet->stats; +} + +static int rionet_rx_clean(struct net_device *ndev) +{ + int i; -+ int error =3D 0; -+ struct rionet_private *rnet =3D ndev->priv; ++ int error = 0; ++ struct rionet_private *rnet = ndev->priv; + void *data; + -+ i =3D rnet->rx_slot; ++ i = rnet->rx_slot; + + do { + if (!rnet->rx_skb[i]) { @@ -154,29 +154,29 @@ new file mode 100644 + continue; + } + -+ if (!(data =3D rio_get_inb_message(rnet->mport, RIONET_MAILBOX))) ++ if (!(data = rio_get_inb_message(rnet->mport, RIONET_MAILBOX))) + break; + -+ 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 ndev; -+ rnet->rx_skb[i]->protocol =3D ++ rnet->rx_skb[i]->dev = ndev; ++ rnet->rx_skb[i]->protocol = + eth_type_trans(rnet->rx_skb[i], ndev); -+ error =3D netif_rx(rnet->rx_skb[i]); ++ error = netif_rx(rnet->rx_skb[i]); + -+ if (error =3D=3D NET_RX_DROP) { ++ if (error == NET_RX_DROP) { + rnet->stats.rx_dropped++; -+ } else if (error =3D=3D NET_RX_BAD) { ++ } else if (error == NET_RX_BAD) { + if (netif_msg_rx_err(rnet)) + printk(KERN_WARNING "%s: bad rx packet\n", + DRV_NAME); + rnet->stats.rx_errors++; + } else { + rnet->stats.rx_packets++; -+ rnet->stats.rx_bytes +=3D RIO_MAX_MSG_SIZE; ++ rnet->stats.rx_bytes += RIO_MAX_MSG_SIZE; + } + -+ } while ((i =3D (i + 1) % RIONET_RX_RING_SIZE) !=3D rnet->rx_slot); ++ } while ((i = (i + 1) % RIONET_RX_RING_SIZE) != rnet->rx_slot); + + return i; +} @@ -184,39 +184,38 @@ new file mode 100644 +static void rionet_rx_fill(struct net_device *ndev, int end) +{ + int i; -+ struct rionet_private *rnet =3D ndev->priv; ++ struct rionet_private *rnet = ndev->priv; + -+ i =3D rnet->rx_slot; ++ i = rnet->rx_slot; + do { -+ rnet->rx_skb[i] =3D dev_alloc_skb(RIO_MAX_MSG_SIZE); ++ rnet->rx_skb[i] = dev_alloc_skb(RIO_MAX_MSG_SIZE); + + if (!rnet->rx_skb[i]) + break; + + rio_add_inb_buffer(rnet->mport, RIONET_MAILBOX, + rnet->rx_skb[i]->data); -+ } while ((i =3D (i + 1) % RIONET_RX_RING_SIZE) !=3D end); ++ } while ((i = (i + 1) % RIONET_RX_RING_SIZE) != end); + -+ rnet->rx_slot =3D i; ++ rnet->rx_slot = i; +} + -+static int rionet_queue_tx_msg(struct sk_buff *skb, struct net_device *nde= -v, ++static int rionet_queue_tx_msg(struct sk_buff *skb, struct net_device *ndev, + struct rio_dev *rdev) +{ -+ struct rionet_private *rnet =3D ndev->priv; ++ struct rionet_private *rnet = ndev->priv; + + rio_add_outb_message(rnet->mport, rdev, 0, skb->data, skb->len); -+ rnet->tx_skb[rnet->tx_slot] =3D skb; ++ rnet->tx_skb[rnet->tx_slot] = skb; + + rnet->stats.tx_packets++; -+ rnet->stats.tx_bytes +=3D skb->len; ++ rnet->stats.tx_bytes += skb->len; + -+ if (++rnet->tx_cnt =3D=3D RIONET_TX_RING_SIZE) ++ if (++rnet->tx_cnt == RIONET_TX_RING_SIZE) + netif_stop_queue(ndev); + -+ if (++rnet->tx_slot =3D=3D RIONET_TX_RING_SIZE) -+ rnet->tx_slot =3D 0; ++ if (++rnet->tx_slot == RIONET_TX_RING_SIZE) ++ rnet->tx_slot = 0; + + if (netif_msg_tx_queued(rnet)) + printk(KERN_INFO "%s: queued skb %8.8x len %8.8x\n", DRV_NAME, @@ -228,8 +227,8 @@ v, +static int rionet_start_xmit(struct sk_buff *skb, struct net_device *ndev) +{ + int i; -+ 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; + @@ -238,7 +237,7 @@ v, + local_irq_restore(flags); + return NETDEV_TX_LOCKED; + } -+=09 ++ + if ((rnet->tx_cnt + 1) > RIONET_TX_RING_SIZE) { + netif_stop_queue(ndev); + spin_unlock_irqrestore(&rnet->tx_lock, flags); @@ -256,12 +255,12 @@ v, + * small number where the ring is relatively full + * on entrance to hard_start_xmit. + */ -+ for (i =3D 0; i < RIO_MAX_ROUTE_ENTRIES; i++) ++ for (i = 0; i < RIO_MAX_ROUTE_ENTRIES; i++) + if (rionet_active[i]) + rionet_queue_tx_msg(skb, ndev, + rionet_active[i]); + } else if (RIONET_MAC_MATCH(eth->h_dest)) { -+ destid =3D RIONET_GET_DESTID(eth->h_dest); ++ destid = RIONET_GET_DESTID(eth->h_dest); + if (rionet_active[destid]) + rionet_queue_tx_msg(skb, ndev, rionet_active[destid]); + } @@ -273,7 +272,7 @@ v, + +static int rionet_set_mac_address(struct net_device *ndev, void *p) +{ -+ struct sockaddr *addr =3D p; ++ struct sockaddr *addr = p; + + if (!is_valid_ether_addr(addr->sa_data)) + return -EADDRNOTAVAIL; @@ -286,24 +285,24 @@ v, +static void rionet_dbell_event(struct rio_mport *mport, u16 sid, u16 tid, + u16 info) +{ -+ struct net_device *ndev =3D sndev; -+ struct rionet_private *rnet =3D ndev->priv; ++ struct net_device *ndev = sndev; ++ struct rionet_private *rnet = ndev->priv; + struct rionet_peer *peer; + + if (netif_msg_intr(rnet)) + printk(KERN_INFO "%s: doorbell sid %4.4x tid %4.4x info %4.4x", + DRV_NAME, sid, tid, info); -+ if (info =3D=3D RIONET_DOORBELL_JOIN) { ++ if (info == RIONET_DOORBELL_JOIN) { + if (!rionet_active[sid]) { + list_for_each_entry(peer, &rionet_peers, node) { -+ if (peer->rdev->destid =3D=3D sid) -+ rionet_active[sid] =3D peer->rdev; ++ if (peer->rdev->destid == sid) ++ rionet_active[sid] = peer->rdev; + } + rio_mport_send_doorbell(mport, sid, + RIONET_DOORBELL_JOIN); + } -+ } else if (info =3D=3D RIONET_DOORBELL_LEAVE) { -+ rionet_active[sid] =3D NULL; ++ } else if (info == RIONET_DOORBELL_LEAVE) { ++ rionet_active[sid] = NULL; + } else { + if (netif_msg_intr(rnet)) + printk(KERN_WARNING "%s: unhandled doorbell\n", @@ -311,28 +310,26 @@ v, + } +} + -+static void rionet_inb_msg_event(struct rio_mport *mport, int mbox, int sl= -ot) ++static void rionet_inb_msg_event(struct rio_mport *mport, int mbox, int slot) +{ + int n; -+ struct net_device *ndev =3D sndev; -+ struct rionet_private *rnet =3D (struct rionet_private *)ndev->priv; ++ struct net_device *ndev = sndev; ++ struct rionet_private *rnet = (struct rionet_private *)ndev->priv; + + if (netif_msg_intr(rnet)) + printk(KERN_INFO "%s: inbound message event, mbox %d slot %d\n", + DRV_NAME, mbox, slot); + + spin_lock(&rnet->lock); -+ if ((n =3D rionet_rx_clean(ndev)) !=3D rnet->rx_slot) ++ if ((n = rionet_rx_clean(ndev)) != rnet->rx_slot) + rionet_rx_fill(ndev, n); + spin_unlock(&rnet->lock); +} + -+static void rionet_outb_msg_event(struct rio_mport *mport, int mbox, int s= -lot) ++static void rionet_outb_msg_event(struct rio_mport *mport, int mbox, int slot) +{ -+ struct net_device *ndev =3D sndev; -+ struct rionet_private *rnet =3D ndev->priv; ++ struct net_device *ndev = sndev; ++ struct rionet_private *rnet = ndev->priv; + + spin_lock(&rnet->lock); + @@ -341,12 +338,12 @@ lot) + "%s: outbound message event, mbox %d slot %d\n", + DRV_NAME, mbox, slot); + -+ while (rnet->tx_cnt && (rnet->ack_slot !=3D slot)) { ++ while (rnet->tx_cnt && (rnet->ack_slot != slot)) { + /* dma unmap single */ + dev_kfree_skb_irq(rnet->tx_skb[rnet->ack_slot]); -+ rnet->tx_skb[rnet->ack_slot] =3D NULL; -+ if (++rnet->ack_slot =3D=3D RIONET_TX_RING_SIZE) -+ rnet->ack_slot =3D 0; ++ rnet->tx_skb[rnet->ack_slot] = NULL; ++ if (++rnet->ack_slot == RIONET_TX_RING_SIZE) ++ rnet->ack_slot = 0; + rnet->tx_cnt--; + } + @@ -358,47 +355,47 @@ lot) + +static int rionet_open(struct net_device *ndev) +{ -+ int i, rc =3D 0; ++ int i, rc = 0; + struct rionet_peer *peer, *tmp; + u32 pwdcsr; -+ struct rionet_private *rnet =3D ndev->priv; ++ struct rionet_private *rnet = ndev->priv; + + if (netif_msg_ifup(rnet)) + printk(KERN_INFO "%s: open\n", DRV_NAME); + -+ if ((rc =3D rio_request_inb_dbell(rnet->mport, ++ if ((rc = rio_request_inb_dbell(rnet->mport, + RIONET_DOORBELL_JOIN, + RIONET_DOORBELL_LEAVE, + rionet_dbell_event)) < 0) + goto out; + -+ if ((rc =3D rio_request_inb_mbox(rnet->mport, ++ if ((rc = rio_request_inb_mbox(rnet->mport, + RIONET_MAILBOX, + RIONET_RX_RING_SIZE, + rionet_inb_msg_event)) < 0) + goto out; + -+ if ((rc =3D rio_request_outb_mbox(rnet->mport, ++ if ((rc = rio_request_outb_mbox(rnet->mport, + RIONET_MAILBOX, + RIONET_TX_RING_SIZE, + rionet_outb_msg_event)) < 0) + goto out; + + /* Initialize inbound message ring */ -+ for (i =3D 0; i < RIONET_RX_RING_SIZE; i++) -+ rnet->rx_skb[i] =3D NULL; -+ rnet->rx_slot =3D 0; ++ for (i = 0; i < RIONET_RX_RING_SIZE; i++) ++ rnet->rx_skb[i] = NULL; ++ rnet->rx_slot = 0; + rionet_rx_fill(ndev, 0); + -+ rnet->tx_slot =3D 0; -+ rnet->tx_cnt =3D 0; -+ rnet->ack_slot =3D 0; ++ rnet->tx_slot = 0; ++ rnet->tx_cnt = 0; ++ rnet->ack_slot = 0; + + netif_carrier_on(ndev); + netif_start_queue(ndev); + + list_for_each_entry_safe(peer, tmp, &rionet_peers, node) { -+ if (!(peer->res =3D rio_request_outb_dbell(peer->rdev, ++ if (!(peer->res = rio_request_outb_dbell(peer->rdev, + RIONET_DOORBELL_JOIN, + RIONET_DOORBELL_LEAVE))) + { @@ -422,7 +419,7 @@ lot) + +static int rionet_close(struct net_device *ndev) +{ -+ struct rionet_private *rnet =3D (struct rionet_private *)ndev->priv; ++ struct rionet_private *rnet = (struct rionet_private *)ndev->priv; + struct rionet_peer *peer, *tmp; + int i; + @@ -432,14 +429,14 @@ lot) + netif_stop_queue(ndev); + netif_carrier_off(ndev); + -+ for (i =3D 0; i < RIONET_RX_RING_SIZE; i++) ++ for (i = 0; i < RIONET_RX_RING_SIZE; i++) + if (rnet->rx_skb[i]) + kfree_skb(rnet->rx_skb[i]); + + list_for_each_entry_safe(peer, tmp, &rionet_peers, node) { + if (rionet_active[peer->rdev->destid]) { + rio_send_doorbell(peer->rdev, RIONET_DOORBELL_LEAVE); -+ rionet_active[peer->rdev->destid] =3D NULL; ++ rionet_active[peer->rdev->destid] = NULL; + } + rio_release_outb_dbell(peer->rdev, peer->res); + } @@ -454,7 +451,7 @@ lot) + +static void rionet_remove(struct rio_dev *rdev) +{ -+ struct net_device *ndev =3D NULL; ++ struct net_device *ndev = NULL; + struct rionet_peer *peer, *tmp; + + unregister_netdev(ndev); @@ -469,7 +466,7 @@ lot) +static void rionet_get_drvinfo(struct net_device *ndev, + struct ethtool_drvinfo *info) +{ -+ struct rionet_private *rnet =3D ndev->priv; ++ struct rionet_private *rnet = ndev->priv; + + strcpy(info->driver, DRV_NAME); + strcpy(info->version, DRV_VERSION); @@ -479,38 +476,38 @@ lot) + +static u32 rionet_get_msglevel(struct net_device *ndev) +{ -+ struct rionet_private *rnet =3D ndev->priv; ++ struct rionet_private *rnet = ndev->priv; + + return rnet->msg_enable; +} + +static void rionet_set_msglevel(struct net_device *ndev, u32 value) +{ -+ struct rionet_private *rnet =3D ndev->priv; ++ struct rionet_private *rnet = ndev->priv; + -+ rnet->msg_enable =3D value; ++ rnet->msg_enable = value; +} + -+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 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 = ethtool_op_get_link, +}; + +static int rionet_setup_netdev(struct rio_mport *mport) +{ -+ int rc =3D 0; -+ struct net_device *ndev =3D NULL; ++ int rc = 0; ++ struct net_device *ndev = NULL; + struct rionet_private *rnet; + u16 device_id; + + /* Allocate our net_device structure */ -+ ndev =3D alloc_etherdev(sizeof(struct rionet_private)); -+ if (ndev =3D=3D NULL) { ++ ndev = alloc_etherdev(sizeof(struct rionet_private)); ++ if (ndev == NULL) { + printk(KERN_INFO "%s: could not allocate ethernet device.\n", + DRV_NAME); -+ rc =3D -ENOMEM; ++ rc = -ENOMEM; + goto out; + } + @@ -519,29 +516,29 @@ lot) + * Perhaps need an array of these that the handler can + * index via the mbox number. + */ -+ sndev =3D ndev; ++ sndev = ndev; + + /* Set up private area */ -+ rnet =3D (struct rionet_private *)ndev->priv; -+ rnet->mport =3D mport; ++ rnet = (struct rionet_private *)ndev->priv; ++ rnet->mport = mport; + + /* Set the default MAC address */ -+ device_id =3D rio_local_get_device_id(mport); -+ ndev->dev_addr[0] =3D 0x00; -+ ndev->dev_addr[1] =3D 0x01; -+ ndev->dev_addr[2] =3D 0x00; -+ ndev->dev_addr[3] =3D 0x01; -+ ndev->dev_addr[4] =3D device_id >> 8; -+ ndev->dev_addr[5] =3D device_id & 0xff; ++ device_id = rio_local_get_device_id(mport); ++ ndev->dev_addr[0] = 0x00; ++ ndev->dev_addr[1] = 0x01; ++ ndev->dev_addr[2] = 0x00; ++ ndev->dev_addr[3] = 0x01; ++ ndev->dev_addr[4] = device_id >> 8; ++ ndev->dev_addr[5] = device_id & 0xff; + + /* Fill in the driver function table */ -+ ndev->open =3D &rionet_open; -+ ndev->hard_start_xmit =3D &rionet_start_xmit; -+ ndev->stop =3D &rionet_close; -+ ndev->get_stats =3D &rionet_stats; -+ ndev->set_mac_address =3D &rionet_set_mac_address; -+ ndev->mtu =3D RIO_MAX_MSG_SIZE - 14; -+ ndev->features =3D NETIF_F_LLTX; ++ ndev->open = &rionet_open; ++ ndev->hard_start_xmit = &rionet_start_xmit; ++ ndev->stop = &rionet_close; ++ ndev->get_stats = &rionet_stats; ++ ndev->set_mac_address = &rionet_set_mac_address; ++ ndev->mtu = RIO_MAX_MSG_SIZE - 14; ++ ndev->features = NETIF_F_LLTX; + SET_ETHTOOL_OPS(ndev, &rionet_ethtool_ops); + + SET_MODULE_OWNER(ndev); @@ -549,10 +546,10 @@ lot) + 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; + + printk("%s: %s %s Version %s, MAC %02x:%02x:%02x:%02x:%02x:%02x\n", @@ -570,10 +567,9 @@ lot) +/* + * XXX Make multi-net safe + */ -+static int rionet_probe(struct rio_dev *rdev, const struct rio_device_id *= -id) ++static int rionet_probe(struct rio_dev *rdev, const struct rio_device_id *id) +{ -+ int rc =3D -ENODEV; ++ int rc = -ENODEV; + u32 lpef, lsrc_ops, ldst_ops; + struct rionet_peer *peer; + @@ -596,13 +592,13 @@ id) + printk(KERN_ERR + "%s: local device is not network capable\n", + DRV_NAME); -+ rionet_check =3D 1; -+ rionet_capable =3D 0; ++ rionet_check = 1; ++ rionet_capable = 0; + goto out; + } + -+ rc =3D rionet_setup_netdev(rdev->net->hport); -+ rionet_check =3D 1; ++ rc = rionet_setup_netdev(rdev->net->hport); ++ rionet_check = 1; + } + + /* @@ -610,11 +606,11 @@ id) + * add it to the peer list. + */ + if (dev_rionet_capable(rdev)) { -+ if (!(peer =3D kmalloc(sizeof(struct rionet_peer), GFP_KERNEL))) { -+ rc =3D -ENOMEM; ++ if (!(peer = kmalloc(sizeof(struct rionet_peer), GFP_KERNEL))) { ++ rc = -ENOMEM; + goto out; + } -+ peer->rdev =3D rdev; ++ peer->rdev = rdev; + list_add_tail(&peer->node, &rionet_peers); + } + @@ -622,15 +618,15 @@ id) + return rc; +} + -+static struct rio_device_id rionet_id_table[] =3D { ++static struct rio_device_id rionet_id_table[] = { + {RIO_DEVICE(RIO_ANY_ID, RIO_ANY_ID)} +}; + -+static struct rio_driver rionet_driver =3D { -+ .name =3D "rionet", -+ .id_table =3D rionet_id_table, -+ .probe =3D rionet_probe, -+ .remove =3D rionet_remove, ++static struct rio_driver rionet_driver = { ++ .name = "rionet", ++ .id_table = rionet_id_table, ++ .probe = rionet_probe, ++ .remove = rionet_remove, +}; + +static int __init rionet_init(void) diff --git a/a/content_digest b/N1/content_digest index 51ba0ba..fe30351 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,9 +3,9 @@ "Subject\0[PATCH][5/5] RapidIO support: net driver\0" "Date\0Mon, 6 Jun 2005 15:40:15 -0700\0" "To\0linux-kernel@vger.kernel.org\0" - "Cc\0netdev@oss.sgi.com" - shemminger@osdl.org - " linuxppc-embedded@ozlabs.org\0" + "Cc\0shemminger@osdl.org" + linuxppc-embedded@ozlabs.org + " netdev@oss.sgi.com\0" "\00:1\0" "b\0" "Adds an \"Ethernet\" driver which sends Ethernet packets over the\n" @@ -20,7 +20,7 @@ "@@ -2185,6 +2185,20 @@ config ISERIES_VETH\n" " \ttristate \"iSeries Virtual Ethernet driver support\"\n" " \tdepends on NETDEVICES && PPC_ISERIES\n" - "=20\n" + " \n" "+config RIONET\n" "+\ttristate \"RapidIO Ethernet over messaging driver support\"\n" "+\tdepends on NETDEVICES && RAPIDIO\n" @@ -41,12 +41,12 @@ "diff --git a/drivers/net/Makefile b/drivers/net/Makefile\n" "--- a/drivers/net/Makefile\n" "+++ b/drivers/net/Makefile\n" - "@@ -58,6 +58,7 @@ obj-$(CONFIG_SKFP) +=3D skfp/\n" - " obj-$(CONFIG_VIA_RHINE) +=3D via-rhine.o\n" - " obj-$(CONFIG_VIA_VELOCITY) +=3D via-velocity.o\n" - " obj-$(CONFIG_ADAPTEC_STARFIRE) +=3D starfire.o\n" - "+obj-$(CONFIG_RIONET) +=3D rionet.o\n" - "=20\n" + "@@ -58,6 +58,7 @@ obj-$(CONFIG_SKFP) += skfp/\n" + " obj-$(CONFIG_VIA_RHINE) += via-rhine.o\n" + " obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o\n" + " obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o\n" + "+obj-$(CONFIG_RIONET) += rionet.o\n" + " \n" " #\n" " # end link order section\n" "diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c\n" @@ -120,9 +120,9 @@ "+\tstruct resource *res;\n" "+};\n" "+\n" - "+static int rionet_check =3D 0;\n" - "+static int rionet_capable =3D 1;\n" - "+static struct net_device *sndev =3D NULL;\n" + "+static int rionet_check = 0;\n" + "+static int rionet_capable = 1;\n" + "+static struct net_device *sndev = NULL;\n" "+\n" "+/*\n" "+ * This is a fast lookup table for for translating TX\n" @@ -140,23 +140,23 @@ "+#define dev_rionet_capable(dev) \\\n" "+\tis_rionet_capable(dev->pef, dev->src_ops, dev->dst_ops)\n" "+\n" - "+#define RIONET_MAC_MATCH(x)\t(*(u32 *)x =3D=3D 0x00010001)\n" + "+#define RIONET_MAC_MATCH(x)\t(*(u32 *)x == 0x00010001)\n" "+#define RIONET_GET_DESTID(x)\t(*(u16 *)(x + 4))\n" "+\n" "+static struct net_device_stats *rionet_stats(struct net_device *ndev)\n" "+{\n" - "+\tstruct rionet_private *rnet =3D ndev->priv;\n" + "+\tstruct rionet_private *rnet = ndev->priv;\n" "+\treturn &rnet->stats;\n" "+}\n" "+\n" "+static int rionet_rx_clean(struct net_device *ndev)\n" "+{\n" "+\tint i;\n" - "+\tint error =3D 0;\n" - "+\tstruct rionet_private *rnet =3D ndev->priv;\n" + "+\tint error = 0;\n" + "+\tstruct rionet_private *rnet = ndev->priv;\n" "+\tvoid *data;\n" "+\n" - "+\ti =3D rnet->rx_slot;\n" + "+\ti = rnet->rx_slot;\n" "+\n" "+\tdo {\n" "+\t\tif (!rnet->rx_skb[i]) {\n" @@ -164,29 +164,29 @@ "+\t\t\tcontinue;\n" "+\t\t}\n" "+\n" - "+\t\tif (!(data =3D rio_get_inb_message(rnet->mport, RIONET_MAILBOX)))\n" + "+\t\tif (!(data = rio_get_inb_message(rnet->mport, RIONET_MAILBOX)))\n" "+\t\t\tbreak;\n" "+\n" - "+\t\trnet->rx_skb[i]->data =3D data;\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 ndev;\n" - "+\t\trnet->rx_skb[i]->protocol =3D\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], ndev);\n" - "+\t\terror =3D netif_rx(rnet->rx_skb[i]);\n" + "+\t\terror = netif_rx(rnet->rx_skb[i]);\n" "+\n" - "+\t\tif (error =3D=3D NET_RX_DROP) {\n" + "+\t\tif (error == NET_RX_DROP) {\n" "+\t\t\trnet->stats.rx_dropped++;\n" - "+\t\t} else if (error =3D=3D NET_RX_BAD) {\n" + "+\t\t} else if (error == NET_RX_BAD) {\n" "+\t\t\tif (netif_msg_rx_err(rnet))\n" "+\t\t\t\tprintk(KERN_WARNING \"%s: bad rx packet\\n\",\n" "+\t\t\t\t DRV_NAME);\n" "+\t\t\trnet->stats.rx_errors++;\n" "+\t\t} else {\n" "+\t\t\trnet->stats.rx_packets++;\n" - "+\t\t\trnet->stats.rx_bytes +=3D RIO_MAX_MSG_SIZE;\n" + "+\t\t\trnet->stats.rx_bytes += RIO_MAX_MSG_SIZE;\n" "+\t\t}\n" "+\n" - "+\t} while ((i =3D (i + 1) % RIONET_RX_RING_SIZE) !=3D rnet->rx_slot);\n" + "+\t} while ((i = (i + 1) % RIONET_RX_RING_SIZE) != rnet->rx_slot);\n" "+\n" "+\treturn i;\n" "+}\n" @@ -194,39 +194,38 @@ "+static void rionet_rx_fill(struct net_device *ndev, int end)\n" "+{\n" "+\tint i;\n" - "+\tstruct rionet_private *rnet =3D ndev->priv;\n" + "+\tstruct rionet_private *rnet = ndev->priv;\n" "+\n" - "+\ti =3D rnet->rx_slot;\n" + "+\ti = rnet->rx_slot;\n" "+\tdo {\n" - "+\t\trnet->rx_skb[i] =3D dev_alloc_skb(RIO_MAX_MSG_SIZE);\n" + "+\t\trnet->rx_skb[i] = dev_alloc_skb(RIO_MAX_MSG_SIZE);\n" "+\n" "+\t\tif (!rnet->rx_skb[i])\n" "+\t\t\tbreak;\n" "+\n" "+\t\trio_add_inb_buffer(rnet->mport, RIONET_MAILBOX,\n" "+\t\t\t\t rnet->rx_skb[i]->data);\n" - "+\t} while ((i =3D (i + 1) % RIONET_RX_RING_SIZE) !=3D end);\n" + "+\t} while ((i = (i + 1) % RIONET_RX_RING_SIZE) != end);\n" "+\n" - "+\trnet->rx_slot =3D i;\n" + "+\trnet->rx_slot = i;\n" "+}\n" "+\n" - "+static int rionet_queue_tx_msg(struct sk_buff *skb, struct net_device *nde=\n" - "v,\n" + "+static int rionet_queue_tx_msg(struct sk_buff *skb, struct net_device *ndev,\n" "+\t\t\t struct rio_dev *rdev)\n" "+{\n" - "+\tstruct rionet_private *rnet =3D ndev->priv;\n" + "+\tstruct rionet_private *rnet = ndev->priv;\n" "+\n" "+\trio_add_outb_message(rnet->mport, rdev, 0, skb->data, skb->len);\n" - "+\trnet->tx_skb[rnet->tx_slot] =3D skb;\n" + "+\trnet->tx_skb[rnet->tx_slot] = skb;\n" "+\n" "+\trnet->stats.tx_packets++;\n" - "+\trnet->stats.tx_bytes +=3D skb->len;\n" + "+\trnet->stats.tx_bytes += skb->len;\n" "+\n" - "+\tif (++rnet->tx_cnt =3D=3D RIONET_TX_RING_SIZE)\n" + "+\tif (++rnet->tx_cnt == RIONET_TX_RING_SIZE)\n" "+\t\tnetif_stop_queue(ndev);\n" "+\n" - "+\tif (++rnet->tx_slot =3D=3D RIONET_TX_RING_SIZE)\n" - "+\t\trnet->tx_slot =3D 0;\n" + "+\tif (++rnet->tx_slot == RIONET_TX_RING_SIZE)\n" + "+\t\trnet->tx_slot = 0;\n" "+\n" "+\tif (netif_msg_tx_queued(rnet))\n" "+\t\tprintk(KERN_INFO \"%s: queued skb %8.8x len %8.8x\\n\", DRV_NAME,\n" @@ -238,8 +237,8 @@ "+static int rionet_start_xmit(struct sk_buff *skb, struct net_device *ndev)\n" "+{\n" "+\tint i;\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" "+\n" @@ -248,7 +247,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_irqrestore(&rnet->tx_lock, flags);\n" @@ -266,12 +265,12 @@ "+\t\t * small number where the ring is relatively full\n" "+\t\t * on entrance to hard_start_xmit.\n" "+\t\t */\n" - "+\t\tfor (i =3D 0; i < RIO_MAX_ROUTE_ENTRIES; i++)\n" + "+\t\tfor (i = 0; i < RIO_MAX_ROUTE_ENTRIES; i++)\n" "+\t\t\tif (rionet_active[i])\n" "+\t\t\t\trionet_queue_tx_msg(skb, ndev,\n" "+\t\t\t\t\t\t rionet_active[i]);\n" "+\t} else if (RIONET_MAC_MATCH(eth->h_dest)) {\n" - "+\t\tdestid =3D RIONET_GET_DESTID(eth->h_dest);\n" + "+\t\tdestid = RIONET_GET_DESTID(eth->h_dest);\n" "+\t\tif (rionet_active[destid])\n" "+\t\t\trionet_queue_tx_msg(skb, ndev, rionet_active[destid]);\n" "+\t}\n" @@ -283,7 +282,7 @@ "+\n" "+static int rionet_set_mac_address(struct net_device *ndev, void *p)\n" "+{\n" - "+\tstruct sockaddr *addr =3D p;\n" + "+\tstruct sockaddr *addr = p;\n" "+\n" "+\tif (!is_valid_ether_addr(addr->sa_data))\n" "+\t\treturn -EADDRNOTAVAIL;\n" @@ -296,24 +295,24 @@ "+static void rionet_dbell_event(struct rio_mport *mport, u16 sid, u16 tid,\n" "+\t\t\t u16 info)\n" "+{\n" - "+\tstruct net_device *ndev =3D sndev;\n" - "+\tstruct rionet_private *rnet =3D ndev->priv;\n" + "+\tstruct net_device *ndev = sndev;\n" + "+\tstruct rionet_private *rnet = ndev->priv;\n" "+\tstruct rionet_peer *peer;\n" "+\n" "+\tif (netif_msg_intr(rnet))\n" "+\t\tprintk(KERN_INFO \"%s: doorbell sid %4.4x tid %4.4x info %4.4x\",\n" "+\t\t DRV_NAME, sid, tid, info);\n" - "+\tif (info =3D=3D RIONET_DOORBELL_JOIN) {\n" + "+\tif (info == RIONET_DOORBELL_JOIN) {\n" "+\t\tif (!rionet_active[sid]) {\n" "+\t\t\tlist_for_each_entry(peer, &rionet_peers, node) {\n" - "+\t\t\t\tif (peer->rdev->destid =3D=3D sid)\n" - "+\t\t\t\t\trionet_active[sid] =3D peer->rdev;\n" + "+\t\t\t\tif (peer->rdev->destid == sid)\n" + "+\t\t\t\t\trionet_active[sid] = peer->rdev;\n" "+\t\t\t}\n" "+\t\t\trio_mport_send_doorbell(mport, sid,\n" "+\t\t\t\t\t\tRIONET_DOORBELL_JOIN);\n" "+\t\t}\n" - "+\t} else if (info =3D=3D RIONET_DOORBELL_LEAVE) {\n" - "+\t\trionet_active[sid] =3D NULL;\n" + "+\t} else if (info == RIONET_DOORBELL_LEAVE) {\n" + "+\t\trionet_active[sid] = NULL;\n" "+\t} else {\n" "+\t\tif (netif_msg_intr(rnet))\n" "+\t\t\tprintk(KERN_WARNING \"%s: unhandled doorbell\\n\",\n" @@ -321,28 +320,26 @@ "+\t}\n" "+}\n" "+\n" - "+static void rionet_inb_msg_event(struct rio_mport *mport, int mbox, int sl=\n" - "ot)\n" + "+static void rionet_inb_msg_event(struct rio_mport *mport, int mbox, int slot)\n" "+{\n" "+\tint n;\n" - "+\tstruct net_device *ndev =3D sndev;\n" - "+\tstruct rionet_private *rnet =3D (struct rionet_private *)ndev->priv;\n" + "+\tstruct net_device *ndev = sndev;\n" + "+\tstruct rionet_private *rnet = (struct rionet_private *)ndev->priv;\n" "+\n" "+\tif (netif_msg_intr(rnet))\n" "+\t\tprintk(KERN_INFO \"%s: inbound message event, mbox %d slot %d\\n\",\n" "+\t\t DRV_NAME, mbox, slot);\n" "+\n" "+\tspin_lock(&rnet->lock);\n" - "+\tif ((n =3D rionet_rx_clean(ndev)) !=3D rnet->rx_slot)\n" + "+\tif ((n = rionet_rx_clean(ndev)) != rnet->rx_slot)\n" "+\t\trionet_rx_fill(ndev, n);\n" "+\tspin_unlock(&rnet->lock);\n" "+}\n" "+\n" - "+static void rionet_outb_msg_event(struct rio_mport *mport, int mbox, int s=\n" - "lot)\n" + "+static void rionet_outb_msg_event(struct rio_mport *mport, int mbox, int slot)\n" "+{\n" - "+\tstruct net_device *ndev =3D sndev;\n" - "+\tstruct rionet_private *rnet =3D ndev->priv;\n" + "+\tstruct net_device *ndev = sndev;\n" + "+\tstruct rionet_private *rnet = ndev->priv;\n" "+\n" "+\tspin_lock(&rnet->lock);\n" "+\n" @@ -351,12 +348,12 @@ "+\t\t \"%s: outbound message event, mbox %d slot %d\\n\",\n" "+\t\t DRV_NAME, mbox, slot);\n" "+\n" - "+\twhile (rnet->tx_cnt && (rnet->ack_slot !=3D slot)) {\n" + "+\twhile (rnet->tx_cnt && (rnet->ack_slot != slot)) {\n" "+\t\t/* dma unmap single */\n" "+\t\tdev_kfree_skb_irq(rnet->tx_skb[rnet->ack_slot]);\n" - "+\t\trnet->tx_skb[rnet->ack_slot] =3D NULL;\n" - "+\t\tif (++rnet->ack_slot =3D=3D RIONET_TX_RING_SIZE)\n" - "+\t\t\trnet->ack_slot =3D 0;\n" + "+\t\trnet->tx_skb[rnet->ack_slot] = NULL;\n" + "+\t\tif (++rnet->ack_slot == RIONET_TX_RING_SIZE)\n" + "+\t\t\trnet->ack_slot = 0;\n" "+\t\trnet->tx_cnt--;\n" "+\t}\n" "+\n" @@ -368,47 +365,47 @@ "+\n" "+static int rionet_open(struct net_device *ndev)\n" "+{\n" - "+\tint i, rc =3D 0;\n" + "+\tint i, rc = 0;\n" "+\tstruct rionet_peer *peer, *tmp;\n" "+\tu32 pwdcsr;\n" - "+\tstruct rionet_private *rnet =3D ndev->priv;\n" + "+\tstruct rionet_private *rnet = ndev->priv;\n" "+\n" "+\tif (netif_msg_ifup(rnet))\n" "+\t\tprintk(KERN_INFO \"%s: open\\n\", DRV_NAME);\n" "+\n" - "+\tif ((rc =3D rio_request_inb_dbell(rnet->mport,\n" + "+\tif ((rc = rio_request_inb_dbell(rnet->mport,\n" "+\t\t\t\t\tRIONET_DOORBELL_JOIN,\n" "+\t\t\t\t\tRIONET_DOORBELL_LEAVE,\n" "+\t\t\t\t\trionet_dbell_event)) < 0)\n" "+\t\tgoto out;\n" "+\n" - "+\tif ((rc =3D rio_request_inb_mbox(rnet->mport,\n" + "+\tif ((rc = rio_request_inb_mbox(rnet->mport,\n" "+\t\t\t\t RIONET_MAILBOX,\n" "+\t\t\t\t RIONET_RX_RING_SIZE,\n" "+\t\t\t\t rionet_inb_msg_event)) < 0)\n" "+\t\tgoto out;\n" "+\n" - "+\tif ((rc =3D rio_request_outb_mbox(rnet->mport,\n" + "+\tif ((rc = rio_request_outb_mbox(rnet->mport,\n" "+\t\t\t\t\tRIONET_MAILBOX,\n" "+\t\t\t\t\tRIONET_TX_RING_SIZE,\n" "+\t\t\t\t\trionet_outb_msg_event)) < 0)\n" "+\t\tgoto out;\n" "+\n" "+\t/* Initialize inbound message ring */\n" - "+\tfor (i =3D 0; i < RIONET_RX_RING_SIZE; i++)\n" - "+\t\trnet->rx_skb[i] =3D NULL;\n" - "+\trnet->rx_slot =3D 0;\n" + "+\tfor (i = 0; i < RIONET_RX_RING_SIZE; i++)\n" + "+\t\trnet->rx_skb[i] = NULL;\n" + "+\trnet->rx_slot = 0;\n" "+\trionet_rx_fill(ndev, 0);\n" "+\n" - "+\trnet->tx_slot =3D 0;\n" - "+\trnet->tx_cnt =3D 0;\n" - "+\trnet->ack_slot =3D 0;\n" + "+\trnet->tx_slot = 0;\n" + "+\trnet->tx_cnt = 0;\n" + "+\trnet->ack_slot = 0;\n" "+\n" "+\tnetif_carrier_on(ndev);\n" "+\tnetif_start_queue(ndev);\n" "+\n" "+\tlist_for_each_entry_safe(peer, tmp, &rionet_peers, node) {\n" - "+\t\tif (!(peer->res =3D rio_request_outb_dbell(peer->rdev,\n" + "+\t\tif (!(peer->res = rio_request_outb_dbell(peer->rdev,\n" "+\t\t\t\t\t\t\t RIONET_DOORBELL_JOIN,\n" "+\t\t\t\t\t\t\t RIONET_DOORBELL_LEAVE)))\n" "+\t\t{\n" @@ -432,7 +429,7 @@ "+\n" "+static int rionet_close(struct net_device *ndev)\n" "+{\n" - "+\tstruct rionet_private *rnet =3D (struct rionet_private *)ndev->priv;\n" + "+\tstruct rionet_private *rnet = (struct rionet_private *)ndev->priv;\n" "+\tstruct rionet_peer *peer, *tmp;\n" "+\tint i;\n" "+\n" @@ -442,14 +439,14 @@ "+\tnetif_stop_queue(ndev);\n" "+\tnetif_carrier_off(ndev);\n" "+\n" - "+\tfor (i =3D 0; i < RIONET_RX_RING_SIZE; i++)\n" + "+\tfor (i = 0; i < RIONET_RX_RING_SIZE; i++)\n" "+\t\tif (rnet->rx_skb[i])\n" "+\t\t\tkfree_skb(rnet->rx_skb[i]);\n" "+\n" "+\tlist_for_each_entry_safe(peer, tmp, &rionet_peers, node) {\n" "+\t\tif (rionet_active[peer->rdev->destid]) {\n" "+\t\t\trio_send_doorbell(peer->rdev, RIONET_DOORBELL_LEAVE);\n" - "+\t\t\trionet_active[peer->rdev->destid] =3D NULL;\n" + "+\t\t\trionet_active[peer->rdev->destid] = NULL;\n" "+\t\t}\n" "+\t\trio_release_outb_dbell(peer->rdev, peer->res);\n" "+\t}\n" @@ -464,7 +461,7 @@ "+\n" "+static void rionet_remove(struct rio_dev *rdev)\n" "+{\n" - "+\tstruct net_device *ndev =3D NULL;\n" + "+\tstruct net_device *ndev = NULL;\n" "+\tstruct rionet_peer *peer, *tmp;\n" "+\n" "+\tunregister_netdev(ndev);\n" @@ -479,7 +476,7 @@ "+static void rionet_get_drvinfo(struct net_device *ndev,\n" "+\t\t\t struct ethtool_drvinfo *info)\n" "+{\n" - "+\tstruct rionet_private *rnet =3D ndev->priv;\n" + "+\tstruct rionet_private *rnet = ndev->priv;\n" "+\n" "+\tstrcpy(info->driver, DRV_NAME);\n" "+\tstrcpy(info->version, DRV_VERSION);\n" @@ -489,38 +486,38 @@ "+\n" "+static u32 rionet_get_msglevel(struct net_device *ndev)\n" "+{\n" - "+\tstruct rionet_private *rnet =3D ndev->priv;\n" + "+\tstruct rionet_private *rnet = ndev->priv;\n" "+\n" "+\treturn rnet->msg_enable;\n" "+}\n" "+\n" "+static void rionet_set_msglevel(struct net_device *ndev, u32 value)\n" "+{\n" - "+\tstruct rionet_private *rnet =3D ndev->priv;\n" + "+\tstruct rionet_private *rnet = ndev->priv;\n" "+\n" - "+\trnet->msg_enable =3D value;\n" + "+\trnet->msg_enable = value;\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 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 = ethtool_op_get_link,\n" "+};\n" "+\n" "+static int rionet_setup_netdev(struct rio_mport *mport)\n" "+{\n" - "+\tint rc =3D 0;\n" - "+\tstruct net_device *ndev =3D NULL;\n" + "+\tint rc = 0;\n" + "+\tstruct net_device *ndev = NULL;\n" "+\tstruct rionet_private *rnet;\n" "+\tu16 device_id;\n" "+\n" "+\t/* Allocate our net_device structure */\n" - "+\tndev =3D alloc_etherdev(sizeof(struct rionet_private));\n" - "+\tif (ndev =3D=3D NULL) {\n" + "+\tndev = alloc_etherdev(sizeof(struct rionet_private));\n" + "+\tif (ndev == NULL) {\n" "+\t\tprintk(KERN_INFO \"%s: could not allocate ethernet device.\\n\",\n" "+\t\t DRV_NAME);\n" - "+\t\trc =3D -ENOMEM;\n" + "+\t\trc = -ENOMEM;\n" "+\t\tgoto out;\n" "+\t}\n" "+\n" @@ -529,29 +526,29 @@ "+\t * Perhaps need an array of these that the handler can\n" "+\t * index via the mbox number.\n" "+\t */\n" - "+\tsndev =3D ndev;\n" + "+\tsndev = ndev;\n" "+\n" "+\t/* Set up private area */\n" - "+\trnet =3D (struct rionet_private *)ndev->priv;\n" - "+\trnet->mport =3D mport;\n" + "+\trnet = (struct rionet_private *)ndev->priv;\n" + "+\trnet->mport = mport;\n" "+\n" "+\t/* Set the default MAC address */\n" - "+\tdevice_id =3D rio_local_get_device_id(mport);\n" - "+\tndev->dev_addr[0] =3D 0x00;\n" - "+\tndev->dev_addr[1] =3D 0x01;\n" - "+\tndev->dev_addr[2] =3D 0x00;\n" - "+\tndev->dev_addr[3] =3D 0x01;\n" - "+\tndev->dev_addr[4] =3D device_id >> 8;\n" - "+\tndev->dev_addr[5] =3D device_id & 0xff;\n" + "+\tdevice_id = rio_local_get_device_id(mport);\n" + "+\tndev->dev_addr[0] = 0x00;\n" + "+\tndev->dev_addr[1] = 0x01;\n" + "+\tndev->dev_addr[2] = 0x00;\n" + "+\tndev->dev_addr[3] = 0x01;\n" + "+\tndev->dev_addr[4] = device_id >> 8;\n" + "+\tndev->dev_addr[5] = device_id & 0xff;\n" "+\n" "+\t/* Fill in the driver function table */\n" - "+\tndev->open =3D &rionet_open;\n" - "+\tndev->hard_start_xmit =3D &rionet_start_xmit;\n" - "+\tndev->stop =3D &rionet_close;\n" - "+\tndev->get_stats =3D &rionet_stats;\n" - "+\tndev->set_mac_address =3D &rionet_set_mac_address;\n" - "+\tndev->mtu =3D RIO_MAX_MSG_SIZE - 14;\n" - "+\tndev->features =3D NETIF_F_LLTX;\n" + "+\tndev->open = &rionet_open;\n" + "+\tndev->hard_start_xmit = &rionet_start_xmit;\n" + "+\tndev->stop = &rionet_close;\n" + "+\tndev->get_stats = &rionet_stats;\n" + "+\tndev->set_mac_address = &rionet_set_mac_address;\n" + "+\tndev->mtu = RIO_MAX_MSG_SIZE - 14;\n" + "+\tndev->features = NETIF_F_LLTX;\n" "+\tSET_ETHTOOL_OPS(ndev, &rionet_ethtool_ops);\n" "+\n" "+\tSET_MODULE_OWNER(ndev);\n" @@ -559,10 +556,10 @@ "+\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;\n" "+\n" "+\tprintk(\"%s: %s %s Version %s, MAC %02x:%02x:%02x:%02x:%02x:%02x\\n\",\n" @@ -580,10 +577,9 @@ "+/*\n" "+ * XXX Make multi-net safe\n" "+ */\n" - "+static int rionet_probe(struct rio_dev *rdev, const struct rio_device_id *=\n" - "id)\n" + "+static int rionet_probe(struct rio_dev *rdev, const struct rio_device_id *id)\n" "+{\n" - "+\tint rc =3D -ENODEV;\n" + "+\tint rc = -ENODEV;\n" "+\tu32 lpef, lsrc_ops, ldst_ops;\n" "+\tstruct rionet_peer *peer;\n" "+\n" @@ -606,13 +602,13 @@ "+\t\t\tprintk(KERN_ERR\n" "+\t\t\t \"%s: local device is not network capable\\n\",\n" "+\t\t\t DRV_NAME);\n" - "+\t\t\trionet_check =3D 1;\n" - "+\t\t\trionet_capable =3D 0;\n" + "+\t\t\trionet_check = 1;\n" + "+\t\t\trionet_capable = 0;\n" "+\t\t\tgoto out;\n" "+\t\t}\n" "+\n" - "+\t\trc =3D rionet_setup_netdev(rdev->net->hport);\n" - "+\t\trionet_check =3D 1;\n" + "+\t\trc = rionet_setup_netdev(rdev->net->hport);\n" + "+\t\trionet_check = 1;\n" "+\t}\n" "+\n" "+\t/*\n" @@ -620,11 +616,11 @@ "+\t * add it to the peer list.\n" "+\t */\n" "+\tif (dev_rionet_capable(rdev)) {\n" - "+\t\tif (!(peer =3D kmalloc(sizeof(struct rionet_peer), GFP_KERNEL))) {\n" - "+\t\t\trc =3D -ENOMEM;\n" + "+\t\tif (!(peer = kmalloc(sizeof(struct rionet_peer), GFP_KERNEL))) {\n" + "+\t\t\trc = -ENOMEM;\n" "+\t\t\tgoto out;\n" "+\t\t}\n" - "+\t\tpeer->rdev =3D rdev;\n" + "+\t\tpeer->rdev = rdev;\n" "+\t\tlist_add_tail(&peer->node, &rionet_peers);\n" "+\t}\n" "+\n" @@ -632,15 +628,15 @@ "+\treturn rc;\n" "+}\n" "+\n" - "+static struct rio_device_id rionet_id_table[] =3D {\n" + "+static struct rio_device_id rionet_id_table[] = {\n" "+\t{RIO_DEVICE(RIO_ANY_ID, RIO_ANY_ID)}\n" "+};\n" "+\n" - "+static struct rio_driver rionet_driver =3D {\n" - "+\t.name =3D \"rionet\",\n" - "+\t.id_table =3D rionet_id_table,\n" - "+\t.probe =3D rionet_probe,\n" - "+\t.remove =3D rionet_remove,\n" + "+static struct rio_driver rionet_driver = {\n" + "+\t.name = \"rionet\",\n" + "+\t.id_table = rionet_id_table,\n" + "+\t.probe = rionet_probe,\n" + "+\t.remove = rionet_remove,\n" "+};\n" "+\n" "+static int __init rionet_init(void)\n" @@ -656,4 +652,4 @@ "+module_init(rionet_init);\n" +module_exit(rionet_exit); -9b8af4a1fb3247824f1d3ce14f3016112be9ba96eac4b69e74f714e38aa9d58f +ce25cc7fb0db683f656eb0dd89103ab8a53220171de157c4aae2748ebe4918f7
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.