* [PATCH][RIO] -mm: Fix macro indenting
@ 2005-06-06 23:52 Matt Porter
2005-06-06 23:52 ` [PATCH][RIO] -mm: Convert EXPORT_SYMBOL -> EXPORT_SYMBOL_GPL Matt Porter
0 siblings, 1 reply; 5+ messages in thread
From: Matt Porter @ 2005-06-06 23:52 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, linuxppc-embedded
Fix up indenting that Lindent fubared.
Signed-off-by: Matt Porter <mporter@kernel.crashing.org
commit 87ff3372a005e4cf927b1b62c23e1c2339d46507
tree 16e1d9454a95a4a1e8b9e50dacd218f8e14dfe14
parent 6e9e41d480cf54c69d47df11f5cba696461ebe1a
author Matt Porter <mporter@kernel.crashing.org> Mon, 06 Jun 2005 09:23:49 =
-0700
committer Matt Porter <mporter@kernel.crashing.org> Mon, 06 Jun 2005 09:23:=
49 -0700
drivers/rio/rio-access.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/rio/rio-access.c b/drivers/rio/rio-access.c
--- a/drivers/rio/rio-access.c
+++ b/drivers/rio/rio-access.c
@@ -77,13 +77,13 @@ int __rio_local_write_config_##size \
}
=20
RIO_LOP_READ(8, u8, 1)
- RIO_LOP_READ(16, u16, 2)
- RIO_LOP_READ(32, u32, 4)
- RIO_LOP_WRITE(8, u8, 1)
- RIO_LOP_WRITE(16, u16, 2)
- RIO_LOP_WRITE(32, u32, 4)
+RIO_LOP_READ(16, u16, 2)
+RIO_LOP_READ(32, u32, 4)
+RIO_LOP_WRITE(8, u8, 1)
+RIO_LOP_WRITE(16, u16, 2)
+RIO_LOP_WRITE(32, u32, 4)
=20
- EXPORT_SYMBOL(__rio_local_read_config_8);
+EXPORT_SYMBOL(__rio_local_read_config_8);
EXPORT_SYMBOL(__rio_local_read_config_16);
EXPORT_SYMBOL(__rio_local_read_config_32);
EXPORT_SYMBOL(__rio_local_write_config_8);
@@ -137,13 +137,13 @@ int rio_mport_write_config_##size \
}
=20
RIO_OP_READ(8, u8, 1)
- RIO_OP_READ(16, u16, 2)
- RIO_OP_READ(32, u32, 4)
- RIO_OP_WRITE(8, u8, 1)
- RIO_OP_WRITE(16, u16, 2)
- RIO_OP_WRITE(32, u32, 4)
+RIO_OP_READ(16, u16, 2)
+RIO_OP_READ(32, u32, 4)
+RIO_OP_WRITE(8, u8, 1)
+RIO_OP_WRITE(16, u16, 2)
+RIO_OP_WRITE(32, u32, 4)
=20
- EXPORT_SYMBOL(rio_mport_read_config_8);
+EXPORT_SYMBOL(rio_mport_read_config_8);
EXPORT_SYMBOL(rio_mport_read_config_16);
EXPORT_SYMBOL(rio_mport_read_config_32);
EXPORT_SYMBOL(rio_mport_write_config_8);
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH][RIO] -mm: Convert EXPORT_SYMBOL -> EXPORT_SYMBOL_GPL
2005-06-06 23:52 [PATCH][RIO] -mm: Fix macro indenting Matt Porter
@ 2005-06-06 23:52 ` Matt Porter
2005-06-06 23:52 ` [PATCH][RIO] -mm: sysfs config space fixes Matt Porter
0 siblings, 1 reply; 5+ messages in thread
From: Matt Porter @ 2005-06-06 23:52 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, linuxppc-embedded
Convert all core exports to EXPORT_SYMBOL_GPL.
Signed-off-by: Matt Porter <mporter@kernel.crashing.org>
commit d45c2d2fedcafd50a860267ff1d517c3071ab585
tree f8ae6a1fbb746cd112ece56ec429a0f71a408afc
parent 87ff3372a005e4cf927b1b62c23e1c2339d46507
author Matt Porter <mporter@kernel.crashing.org> Mon, 06 Jun 2005 09:29:21 =
-0700
committer Matt Porter <mporter@kernel.crashing.org> Mon, 06 Jun 2005 09:29:=
21 -0700
drivers/rio/rio-access.c | 26 +++++++++++++-------------
drivers/rio/rio-driver.c | 10 +++++-----
drivers/rio/rio.c | 22 +++++++++++-----------
3 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/drivers/rio/rio-access.c b/drivers/rio/rio-access.c
--- a/drivers/rio/rio-access.c
+++ b/drivers/rio/rio-access.c
@@ -83,12 +83,12 @@ RIO_LOP_WRITE(8, u8, 1)
RIO_LOP_WRITE(16, u16, 2)
RIO_LOP_WRITE(32, u32, 4)
=20
-EXPORT_SYMBOL(__rio_local_read_config_8);
-EXPORT_SYMBOL(__rio_local_read_config_16);
-EXPORT_SYMBOL(__rio_local_read_config_32);
-EXPORT_SYMBOL(__rio_local_write_config_8);
-EXPORT_SYMBOL(__rio_local_write_config_16);
-EXPORT_SYMBOL(__rio_local_write_config_32);
+EXPORT_SYMBOL_GPL(__rio_local_read_config_8);
+EXPORT_SYMBOL_GPL(__rio_local_read_config_16);
+EXPORT_SYMBOL_GPL(__rio_local_read_config_32);
+EXPORT_SYMBOL_GPL(__rio_local_write_config_8);
+EXPORT_SYMBOL_GPL(__rio_local_write_config_16);
+EXPORT_SYMBOL_GPL(__rio_local_write_config_32);
=20
/**
* RIO_OP_READ - Generate rio_mport_read_config_* functions
@@ -143,12 +143,12 @@ RIO_OP_WRITE(8, u8, 1)
RIO_OP_WRITE(16, u16, 2)
RIO_OP_WRITE(32, u32, 4)
=20
-EXPORT_SYMBOL(rio_mport_read_config_8);
-EXPORT_SYMBOL(rio_mport_read_config_16);
-EXPORT_SYMBOL(rio_mport_read_config_32);
-EXPORT_SYMBOL(rio_mport_write_config_8);
-EXPORT_SYMBOL(rio_mport_write_config_16);
-EXPORT_SYMBOL(rio_mport_write_config_32);
+EXPORT_SYMBOL_GPL(rio_mport_read_config_8);
+EXPORT_SYMBOL_GPL(rio_mport_read_config_16);
+EXPORT_SYMBOL_GPL(rio_mport_read_config_32);
+EXPORT_SYMBOL_GPL(rio_mport_write_config_8);
+EXPORT_SYMBOL_GPL(rio_mport_write_config_16);
+EXPORT_SYMBOL_GPL(rio_mport_write_config_32);
=20
/**
* rio_mport_send_doorbell - Send a doorbell message
@@ -172,4 +172,4 @@ int rio_mport_send_doorbell(struct rio_m
return res;
}
=20
-EXPORT_SYMBOL(rio_mport_send_doorbell);
+EXPORT_SYMBOL_GPL(rio_mport_send_doorbell);
diff --git a/drivers/rio/rio-driver.c b/drivers/rio/rio-driver.c
--- a/drivers/rio/rio-driver.c
+++ b/drivers/rio/rio-driver.c
@@ -222,8 +222,8 @@ static int __init rio_bus_init(void)
=20
postcore_initcall(rio_bus_init);
=20
-EXPORT_SYMBOL(rio_register_driver);
-EXPORT_SYMBOL(rio_unregister_driver);
-EXPORT_SYMBOL(rio_bus_type);
-EXPORT_SYMBOL(rio_dev_get);
-EXPORT_SYMBOL(rio_dev_put);
+EXPORT_SYMBOL_GPL(rio_register_driver);
+EXPORT_SYMBOL_GPL(rio_unregister_driver);
+EXPORT_SYMBOL_GPL(rio_bus_type);
+EXPORT_SYMBOL_GPL(rio_dev_get);
+EXPORT_SYMBOL_GPL(rio_dev_put);
diff --git a/drivers/rio/rio.c b/drivers/rio/rio.c
--- a/drivers/rio/rio.c
+++ b/drivers/rio/rio.c
@@ -490,14 +490,14 @@ void rio_register_mport(struct rio_mport
list_add_tail(&port->node, &rio_mports);
}
=20
-EXPORT_SYMBOL(rio_local_get_device_id);
-EXPORT_SYMBOL(rio_get_device);
-EXPORT_SYMBOL(rio_get_asm);
-EXPORT_SYMBOL(rio_request_inb_dbell);
-EXPORT_SYMBOL(rio_release_inb_dbell);
-EXPORT_SYMBOL(rio_request_outb_dbell);
-EXPORT_SYMBOL(rio_release_outb_dbell);
-EXPORT_SYMBOL(rio_request_inb_mbox);
-EXPORT_SYMBOL(rio_release_inb_mbox);
-EXPORT_SYMBOL(rio_request_outb_mbox);
-EXPORT_SYMBOL(rio_release_outb_mbox);
+EXPORT_SYMBOL_GPL(rio_local_get_device_id);
+EXPORT_SYMBOL_GPL(rio_get_device);
+EXPORT_SYMBOL_GPL(rio_get_asm);
+EXPORT_SYMBOL_GPL(rio_request_inb_dbell);
+EXPORT_SYMBOL_GPL(rio_release_inb_dbell);
+EXPORT_SYMBOL_GPL(rio_request_outb_dbell);
+EXPORT_SYMBOL_GPL(rio_release_outb_dbell);
+EXPORT_SYMBOL_GPL(rio_request_inb_mbox);
+EXPORT_SYMBOL_GPL(rio_release_inb_mbox);
+EXPORT_SYMBOL_GPL(rio_request_outb_mbox);
+EXPORT_SYMBOL_GPL(rio_release_outb_mbox);
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH][RIO] -mm: sysfs config space fixes
2005-06-06 23:52 ` [PATCH][RIO] -mm: Convert EXPORT_SYMBOL -> EXPORT_SYMBOL_GPL Matt Porter
@ 2005-06-06 23:52 ` Matt Porter
2005-06-06 23:52 ` [PATCH][RIO] -mm: ppc32 EXPORT_SYMBOL_GPL conversions Matt Porter
0 siblings, 1 reply; 5+ messages in thread
From: Matt Porter @ 2005-06-06 23:52 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, linuxppc-embedded
Fix sysfs config space access similar to the recent PCI sysfs changes.=20
Signed-off-by: Matt Porter <mporter@kernel.crashing.org>
commit 2a28743938495ab6055db2e29f3e0721bba022cc
tree 09d592a46eff8592327b20c609595eb8b7d5e333
parent d45c2d2fedcafd50a860267ff1d517c3071ab585
author Matt Porter <mporter@kernel.crashing.org> Mon, 06 Jun 2005 14:50:28 =
-0700
committer Matt Porter <mporter@kernel.crashing.org> Mon, 06 Jun 2005 14:50:=
28 -0700
drivers/rio/rio-sysfs.c | 82 +++++++++++++++++++++++++++++++++----------=
----
1 files changed, 58 insertions(+), 24 deletions(-)
diff --git a/drivers/rio/rio-sysfs.c b/drivers/rio/rio-sysfs.c
--- a/drivers/rio/rio-sysfs.c
+++ b/drivers/rio/rio-sysfs.c
@@ -74,10 +74,11 @@ rio_read_config(struct kobject *kobj, ch
to_rio_dev(container_of(kobj, struct device, kobj));
unsigned int size =3D 0x100;
loff_t init_off =3D off;
+ u8 *data =3D (u8 *) buf;
=20
/* Several chips lock up trying to read undefined config space */
if (capable(CAP_SYS_ADMIN))
- size =3D 0x80000;
+ size =3D 0x200000;
=20
if (off > size)
return 0;
@@ -88,30 +89,47 @@ rio_read_config(struct kobject *kobj, ch
size =3D count;
}
=20
- while (off & 3) {
- unsigned char val;
+ if ((off & 1) && size) {
+ u8 val;
rio_read_config_8(dev, off, &val);
- buf[off - init_off] =3D val;
+ data[off - init_off] =3D val;
off++;
- if (--size =3D=3D 0)
- break;
+ size--;
+ }
+
+ if ((off & 3) && size > 2) {
+ u16 val;
+ rio_read_config_16(dev, off, &val);
+ data[off - init_off] =3D (val >> 8) & 0xff;
+ data[off - init_off + 1] =3D val & 0xff;
+ off +=3D 2;
+ size -=3D 2;
}
=20
while (size > 3) {
- unsigned int val;
+ u32 val;
rio_read_config_32(dev, off, &val);
- buf[off - init_off] =3D (val >> 24) & 0xff;
- buf[off - init_off + 1] =3D (val >> 16) & 0xff;
- buf[off - init_off + 2] =3D (val >> 8) & 0xff;
- buf[off - init_off + 3] =3D val & 0xff;
+ data[off - init_off] =3D (val >> 24) & 0xff;
+ data[off - init_off + 1] =3D (val >> 16) & 0xff;
+ data[off - init_off + 2] =3D (val >> 8) & 0xff;
+ data[off - init_off + 3] =3D val & 0xff;
off +=3D 4;
size -=3D 4;
}
=20
- while (size > 0) {
- unsigned char val;
+ if (size >=3D 2) {
+ u16 val;
+ rio_read_config_16(dev, off, &val);
+ data[off - init_off] =3D (val >> 8) & 0xff;
+ data[off - init_off + 1] =3D val & 0xff;
+ off +=3D 2;
+ size -=3D 2;
+ }
+
+ if (size > 0) {
+ u8 val;
rio_read_config_8(dev, off, &val);
- buf[off - init_off] =3D val;
+ data[off - init_off] =3D val;
off++;
--size;
}
@@ -126,6 +144,7 @@ rio_write_config(struct kobject *kobj, c
to_rio_dev(container_of(kobj, struct device, kobj));
unsigned int size =3D count;
loff_t init_off =3D off;
+ u8 *data =3D (u8 *) buf;
=20
if (off > 0x200000)
return 0;
@@ -134,25 +153,40 @@ rio_write_config(struct kobject *kobj, c
count =3D size;
}
=20
- while (off & 3) {
- rio_write_config_8(dev, off, buf[off - init_off]);
+ if ((off & 1) && size) {
+ rio_write_config_8(dev, off, data[off - init_off]);
off++;
- if (--size =3D=3D 0)
- break;
+ size--;
+ }
+
+ if ((off & 3) && (size > 2)) {
+ u16 val =3D data[off - init_off + 1];
+ val |=3D (u16) data[off - init_off] << 8;
+ rio_write_config_16(dev, off, val);
+ off +=3D 2;
+ size -=3D 2;
}
=20
while (size > 3) {
- unsigned int val =3D buf[off - init_off + 3];
- val |=3D (unsigned int)buf[off - init_off + 2] << 8;
- val |=3D (unsigned int)buf[off - init_off + 1] << 16;
- val |=3D (unsigned int)buf[off - init_off] << 24;
+ u32 val =3D data[off - init_off + 3];
+ val |=3D (u32) data[off - init_off + 2] << 8;
+ val |=3D (u32) data[off - init_off + 1] << 16;
+ val |=3D (u32) data[off - init_off] << 24;
rio_write_config_32(dev, off, val);
off +=3D 4;
size -=3D 4;
}
=20
- while (size > 0) {
- rio_write_config_8(dev, off, buf[off - init_off]);
+ if (size >=3D 2) {
+ u16 val =3D data[off - init_off + 1];
+ val |=3D (u16) data[off - init_off] << 8;
+ rio_write_config_16(dev, off, val);
+ off +=3D 2;
+ size -=3D 2;
+ }
+
+ if (size) {
+ rio_write_config_8(dev, off, data[off - init_off]);
off++;
--size;
}
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH][RIO] -mm: ppc32 EXPORT_SYMBOL_GPL conversions
2005-06-06 23:52 ` [PATCH][RIO] -mm: sysfs config space fixes Matt Porter
@ 2005-06-06 23:52 ` Matt Porter
2005-06-06 23:52 ` [PATCH][RIO] -mm: rionet updates Matt Porter
0 siblings, 1 reply; 5+ messages in thread
From: Matt Porter @ 2005-06-06 23:52 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, linuxppc-embedded
Convert PPC32/MPC85xx EXPORT_SYMBOL->EXPORT_SYMBOL_GPL.
Signed-off-by: Matt Porter <mporter@kernel.crashing.org>
commit 113049d95f681dcb7317d7c641cc180634b35a1d
tree fe55ba09ede44aac1dfb0c416143ea3b4a8ca9a2
parent 7127e712a4aac828daecd47be8a0d15b3977a5e0
author Matt Porter <mporter@kernel.crashing.org> Mon, 06 Jun 2005 10:26:57 =
-0700
committer Matt Porter <mporter@kernel.crashing.org> Mon, 06 Jun 2005 10:26:=
57 -0700
arch/ppc/syslib/ppc85xx_rio.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/ppc/syslib/ppc85xx_rio.c b/arch/ppc/syslib/ppc85xx_rio.c
--- a/arch/ppc/syslib/ppc85xx_rio.c
+++ b/arch/ppc/syslib/ppc85xx_rio.c
@@ -341,7 +341,7 @@ rio_hw_add_outb_message(struct rio_mport
return ret;
}
=20
-EXPORT_SYMBOL(rio_hw_add_outb_message);
+EXPORT_SYMBOL_GPL(rio_hw_add_outb_message);
=20
/**
* mpc85xx_rio_tx_handler - MPC85xx outbound message interrupt handler
@@ -637,7 +637,7 @@ int rio_hw_add_inb_buffer(struct rio_mpo
return rc;
}
=20
-EXPORT_SYMBOL(rio_hw_add_inb_buffer);
+EXPORT_SYMBOL_GPL(rio_hw_add_inb_buffer);
=20
/**
* rio_hw_get_inb_message - Fetch inbound message from the MPC85xx message=
unit
@@ -684,7 +684,7 @@ void *rio_hw_get_inb_message(struct rio_
return buf;
}
=20
-EXPORT_SYMBOL(rio_hw_get_inb_message);
+EXPORT_SYMBOL_GPL(rio_hw_get_inb_message);
=20
/**
* mpc85xx_rio_dbell_handler - MPC85xx doorbell interrupt handler
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH][RIO] -mm: rionet updates
2005-06-06 23:52 ` [PATCH][RIO] -mm: ppc32 EXPORT_SYMBOL_GPL conversions Matt Porter
@ 2005-06-06 23:52 ` Matt Porter
0 siblings, 0 replies; 5+ messages in thread
From: Matt Porter @ 2005-06-06 23:52 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, linuxppc-embedded
Cleanups, eliminate unused paths, and add LLTX support.
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
drivers/net/rionet.c | 73 ++++++++++++++++------------------------------=
----
1 files changed, 24 insertions(+), 49 deletions(-)
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
--- 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 {
int tx_cnt;
int ack_slot;
spinlock_t lock;
+ 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;
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
- 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) {
@@ -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;
u16 destid;
+ unsigned long flags;
=20
- spin_lock_irq(&rnet->lock);
-
+ local_irq_save(flags);
+ if (!spin_trylock(&rnet->tx_lock)) {
+ 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);
- return -EBUSY;
+ spin_unlock_irqrestore(&rnet->tx_lock, flags);
+ printk(KERN_ERR "%s: BUG! Tx Ring full when queue awake!\n",
+ 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;
-
- if (netif_msg_drv(rnet))
- printk(KERN_WARNING
- "%s: rionet_change_mtu(): not implemented\n", DRV_NAME);
-
- return 0;
-}
-
-static void rionet_set_multicast_list(struct net_device *ndev)
-{
- struct rionet_private *rnet =3D ndev->priv;
-
- if (netif_msg_drv(rnet))
- printk(KERN_WARNING
- "%s: rionet_set_multicast_list(): not implemented\n",
- DRV_NAME);
-}
-
static void rionet_dbell_event(struct rio_mport *mport, u16 sid, u16 tid,
u16 info)
{
@@ -358,10 +345,6 @@ static int rionet_open(struct net_device
rnet->tx_cnt =3D 0;
rnet->ack_slot =3D 0;
=20
- spin_lock_init(&rnet->lock);
-
- rnet->msg_enable =3D 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;
-}
-
static void rionet_get_drvinfo(struct net_device *ndev,
struct ethtool_drvinfo *info)
{
@@ -464,16 +442,11 @@ static void rionet_set_msglevel(struct n
rnet->msg_enable =3D 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,
};
=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;
- SET_ETHTOOL_OPS(ndev, &rionet_ethtool_ops);
-
ndev->mtu =3D RIO_MAX_MSG_SIZE - 14;
+ ndev->features =3D 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;
+
rc =3D register_netdev(ndev);
if (rc !=3D 0)
goto out;
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2005-06-06 23:52 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-06-06 23:52 [PATCH][RIO] -mm: Fix macro indenting Matt Porter
2005-06-06 23:52 ` [PATCH][RIO] -mm: Convert EXPORT_SYMBOL -> EXPORT_SYMBOL_GPL Matt Porter
2005-06-06 23:52 ` [PATCH][RIO] -mm: sysfs config space fixes Matt Porter
2005-06-06 23:52 ` [PATCH][RIO] -mm: ppc32 EXPORT_SYMBOL_GPL conversions Matt Porter
2005-06-06 23:52 ` [PATCH][RIO] -mm: rionet updates Matt Porter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).