This should fix. I'm not sure why it's overriding dev->flags.
drivers/net/sb1000.c | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff -puN drivers/net/sb1000.c~sb1000-fix drivers/net/sb1000.c
--- 25/drivers/net/sb1000.c~sb1000-fix 2003-05-14 10:24:35.000000000 -0700
+++ 25-akpm/drivers/net/sb1000.c 2003-05-14 10:30:36.000000000 -0700
@@ -137,17 +137,6 @@ static const struct pnp_device_id sb1000
};
MODULE_DEVICE_TABLE(pnp, sb1000_pnp_ids);
-static void
-sb1000_setup(struct net_device *dev)
-{
- dev->type = ARPHRD_ETHER;
- dev->mtu = 1500;
- dev->addr_len = ETH_ALEN;
-
- /* New-style flags. */
- dev->flags = IFF_POINTOPOINT|IFF_NOARP;
-}
-
static int
sb1000_probe_one(struct pnp_dev *pdev, const struct pnp_device_id *id)
{
@@ -188,11 +177,16 @@ sb1000_probe_one(struct pnp_dev *pdev, c
"S/N %#8.8x, IRQ %d.\n", dev->name, dev->base_addr,
dev->mem_start, serial_number, dev->irq);
- dev = alloc_netdev(sizeof(struct sb1000_private), "cm%d", sb1000_setup);
+ dev = alloc_etherdev(sizeof(struct sb1000_private));
if (!dev) {
error = -ENOMEM;
goto out_release_regions;
}
+
+ /* New-style flags. */
+ /* This seems bogus */
+ dev->flags = IFF_POINTOPOINT|IFF_NOARP;
+
SET_MODULE_OWNER(dev);
if (sb1000_debug > 0)
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/