Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
phylib: Silence driver registration
phylib: Add ID for Marvell 88E1240
82596: free nonexistent resource fix
SUNHME: Fix missing NETIF_F_VLAN_CHALLENGED on PCI happy meals
+23
-9
+2
-1
drivers/net/82596.c
+2
-1
drivers/net/82596.c
···
1192
1192
goto out;
1193
1193
}
1194
1194
1195
+
dev->base_addr = ioaddr;
1196
+
1195
1197
for (i = 0; i < 8; i++) {
1196
1198
eth_addr[i] = inb(ioaddr + 8 + i);
1197
1199
checksum += eth_addr[i];
···
1211
1209
goto out1;
1212
1210
}
1213
1211
1214
-
dev->base_addr = ioaddr;
1215
1212
dev->irq = 10;
1216
1213
}
1217
1214
#endif
+18
-5
drivers/net/phy/marvell.c
+18
-5
drivers/net/phy/marvell.c
···
265
265
.read_status = &genphy_read_status,
266
266
.ack_interrupt = &marvell_ack_interrupt,
267
267
.config_intr = &marvell_config_intr,
268
-
.driver = {.owner = THIS_MODULE,},
268
+
.driver = { .owner = THIS_MODULE },
269
269
},
270
270
{
271
271
.phy_id = 0x01410c90,
···
278
278
.read_status = &genphy_read_status,
279
279
.ack_interrupt = &marvell_ack_interrupt,
280
280
.config_intr = &marvell_config_intr,
281
-
.driver = {.owner = THIS_MODULE,},
281
+
.driver = { .owner = THIS_MODULE },
282
282
},
283
283
{
284
284
.phy_id = 0x01410cc0,
···
291
291
.read_status = &genphy_read_status,
292
292
.ack_interrupt = &marvell_ack_interrupt,
293
293
.config_intr = &marvell_config_intr,
294
-
.driver = {.owner = THIS_MODULE,},
294
+
.driver = { .owner = THIS_MODULE },
295
295
},
296
296
{
297
297
.phy_id = 0x01410cd0,
···
304
304
.read_status = &genphy_read_status,
305
305
.ack_interrupt = &marvell_ack_interrupt,
306
306
.config_intr = &marvell_config_intr,
307
-
.driver = {.owner = THIS_MODULE,},
308
-
}
307
+
.driver = { .owner = THIS_MODULE },
308
+
},
309
+
{
310
+
.phy_id = 0x01410e30,
311
+
.phy_id_mask = 0xfffffff0,
312
+
.name = "Marvell 88E1240",
313
+
.features = PHY_GBIT_FEATURES,
314
+
.flags = PHY_HAS_INTERRUPT,
315
+
.config_init = &m88e1111_config_init,
316
+
.config_aneg = &marvell_config_aneg,
317
+
.read_status = &genphy_read_status,
318
+
.ack_interrupt = &marvell_ack_interrupt,
319
+
.config_intr = &marvell_config_intr,
320
+
.driver = { .owner = THIS_MODULE },
321
+
},
309
322
};
310
323
311
324
static int __init marvell_init(void)
+1
-1
drivers/net/phy/phy_device.c
+1
-1
drivers/net/phy/phy_device.c
+2
-2
drivers/net/sunhme.c
+2
-2
drivers/net/sunhme.c
···
3143
3143
dev->irq = pdev->irq;
3144
3144
dev->dma = 0;
3145
3145
3146
-
/* Happy Meal can do it all... */
3147
-
dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM;
3146
+
/* Happy Meal can do it all... except VLAN. */
3147
+
dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_VLAN_CHALLENGED;
3148
3148
3149
3149
#if defined(CONFIG_SBUS) && defined(CONFIG_PCI)
3150
3150
/* Hook up PCI register/dma accessors. */