aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-30 21:42:58 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-30 21:42:58 -0400
commit3985c7ce85039adacdf882904ca096f091d39346 (patch)
treeafaf4161c4c3d9516cc09295eb30c0e22a8c3008 /drivers
parentfcf744a96c66ca6ad7301a372034b771e57f30c4 (diff)
parentce384d91cd7a4269a1ed5d4307a70aa4c6fa14f2 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: isdn: mISDN: socket: fix information leak to userland netdev: can: Change mail address of Hans J. Koch pcnet_cs: add new_id net: Truncate recvfrom and sendto length to INT_MAX. RDS: Let rds_message_alloc_sgs() return NULL RDS: Copy rds_iovecs into kernel memory instead of rereading from userspace RDS: Clean up error handling in rds_cmsg_rdma_args RDS: Return -EINVAL if rds_rdma_pages returns an error net: fix rds_iovec page count overflow can: pch_can: fix section mismatch warning by using a whitelisted name can: pch_can: fix sparse warning netxen_nic: Fix the tx queue manipulation bug in netxen_nic_probe ip_gre: fix fallback tunnel setup vmxnet: trivial annotation of protocol constant vmxnet3: remove unnecessary byteswapping in BAR writing macros ipv6/udp: report SndbufErrors and RcvbufErrors phy/marvell: rename 88ec048 to 88e1318s and fix mscr1 addr
Diffstat (limited to 'drivers')
-rw-r--r--drivers/isdn/mISDN/socket.c2
-rw-r--r--drivers/net/can/at91_can.c2
-rw-r--r--drivers/net/can/pch_can.c10
-rw-r--r--drivers/net/netxen/netxen_nic_main.c1
-rw-r--r--drivers/net/pcmcia/pcnet_cs.c1
-rw-r--r--drivers/net/phy/marvell.c18
-rw-r--r--drivers/net/vmxnet3/vmxnet3_drv.c2
-rw-r--r--drivers/net/vmxnet3/vmxnet3_int.h8
8 files changed, 23 insertions, 21 deletions
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
index 3232206406b1..7446d8b4282d 100644
--- a/drivers/isdn/mISDN/socket.c
+++ b/drivers/isdn/mISDN/socket.c
@@ -392,6 +392,7 @@ data_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
392 if (dev) { 392 if (dev) {
393 struct mISDN_devinfo di; 393 struct mISDN_devinfo di;
394 394
395 memset(&di, 0, sizeof(di));
395 di.id = dev->id; 396 di.id = dev->id;
396 di.Dprotocols = dev->Dprotocols; 397 di.Dprotocols = dev->Dprotocols;
397 di.Bprotocols = dev->Bprotocols | get_all_Bprotocols(); 398 di.Bprotocols = dev->Bprotocols | get_all_Bprotocols();
@@ -672,6 +673,7 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
672 if (dev) { 673 if (dev) {
673 struct mISDN_devinfo di; 674 struct mISDN_devinfo di;
674 675
676 memset(&di, 0, sizeof(di));
675 di.id = dev->id; 677 di.id = dev->id;
676 di.Dprotocols = dev->Dprotocols; 678 di.Dprotocols = dev->Dprotocols;
677 di.Bprotocols = dev->Bprotocols | get_all_Bprotocols(); 679 di.Bprotocols = dev->Bprotocols | get_all_Bprotocols();
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index cee98fa668bd..7ef83d06f7ed 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * at91_can.c - CAN network driver for AT91 SoC CAN controller 2 * at91_can.c - CAN network driver for AT91 SoC CAN controller
3 * 3 *
4 * (C) 2007 by Hans J. Koch <hjk@linutronix.de> 4 * (C) 2007 by Hans J. Koch <hjk@hansjkoch.de>
5 * (C) 2008, 2009, 2010 by Marc Kleine-Budde <kernel@pengutronix.de> 5 * (C) 2008, 2009, 2010 by Marc Kleine-Budde <kernel@pengutronix.de>
6 * 6 *
7 * This software may be distributed under the terms of the GNU General 7 * This software may be distributed under the terms of the GNU General
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 55ec324caaf4..672718261c68 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -213,12 +213,12 @@ static DEFINE_PCI_DEVICE_TABLE(pch_pci_tbl) = {
213}; 213};
214MODULE_DEVICE_TABLE(pci, pch_pci_tbl); 214MODULE_DEVICE_TABLE(pci, pch_pci_tbl);
215 215
216static inline void pch_can_bit_set(u32 *addr, u32 mask) 216static inline void pch_can_bit_set(void __iomem *addr, u32 mask)
217{ 217{
218 iowrite32(ioread32(addr) | mask, addr); 218 iowrite32(ioread32(addr) | mask, addr);
219} 219}
220 220
221static inline void pch_can_bit_clear(u32 *addr, u32 mask) 221static inline void pch_can_bit_clear(void __iomem *addr, u32 mask)
222{ 222{
223 iowrite32(ioread32(addr) & ~mask, addr); 223 iowrite32(ioread32(addr) & ~mask, addr);
224} 224}
@@ -1437,7 +1437,7 @@ probe_exit_endev:
1437 return rc; 1437 return rc;
1438} 1438}
1439 1439
1440static struct pci_driver pch_can_pcidev = { 1440static struct pci_driver pch_can_pci_driver = {
1441 .name = "pch_can", 1441 .name = "pch_can",
1442 .id_table = pch_pci_tbl, 1442 .id_table = pch_pci_tbl,
1443 .probe = pch_can_probe, 1443 .probe = pch_can_probe,
@@ -1448,13 +1448,13 @@ static struct pci_driver pch_can_pcidev = {
1448 1448
1449static int __init pch_can_pci_init(void) 1449static int __init pch_can_pci_init(void)
1450{ 1450{
1451 return pci_register_driver(&pch_can_pcidev); 1451 return pci_register_driver(&pch_can_pci_driver);
1452} 1452}
1453module_init(pch_can_pci_init); 1453module_init(pch_can_pci_init);
1454 1454
1455static void __exit pch_can_pci_exit(void) 1455static void __exit pch_can_pci_exit(void)
1456{ 1456{
1457 pci_unregister_driver(&pch_can_pcidev); 1457 pci_unregister_driver(&pch_can_pci_driver);
1458} 1458}
1459module_exit(pch_can_pci_exit); 1459module_exit(pch_can_pci_exit);
1460 1460
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 35ae1aa12896..a75ba9517404 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -1240,7 +1240,6 @@ netxen_setup_netdev(struct netxen_adapter *adapter,
1240 dev_warn(&pdev->dev, "failed to read mac addr\n"); 1240 dev_warn(&pdev->dev, "failed to read mac addr\n");
1241 1241
1242 netif_carrier_off(netdev); 1242 netif_carrier_off(netdev);
1243 netif_stop_queue(netdev);
1244 1243
1245 err = register_netdev(netdev); 1244 err = register_netdev(netdev);
1246 if (err) { 1245 if (err) {
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 03096c80103d..d05c44692f08 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -1536,6 +1536,7 @@ static struct pcmcia_device_id pcnet_ids[] = {
1536 PCMCIA_DEVICE_PROD_ID12("COMPU-SHACK", "FASTline PCMCIA 10/100 Fast-Ethernet", 0xfa2e424d, 0x3953d9b9), 1536 PCMCIA_DEVICE_PROD_ID12("COMPU-SHACK", "FASTline PCMCIA 10/100 Fast-Ethernet", 0xfa2e424d, 0x3953d9b9),
1537 PCMCIA_DEVICE_PROD_ID12("CONTEC", "C-NET(PC)C-10L", 0x21cab552, 0xf6f90722), 1537 PCMCIA_DEVICE_PROD_ID12("CONTEC", "C-NET(PC)C-10L", 0x21cab552, 0xf6f90722),
1538 PCMCIA_DEVICE_PROD_ID12("corega", "FEther PCC-TXF", 0x0a21501a, 0xa51564a2), 1538 PCMCIA_DEVICE_PROD_ID12("corega", "FEther PCC-TXF", 0x0a21501a, 0xa51564a2),
1539 PCMCIA_DEVICE_PROD_ID12("corega", "Ether CF-TD", 0x0a21501a, 0x6589340a),
1539 PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega EtherII PCC-T", 0x5261440f, 0xfa9d85bd), 1540 PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega EtherII PCC-T", 0x5261440f, 0xfa9d85bd),
1540 PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega EtherII PCC-TD", 0x5261440f, 0xc49bd73d), 1541 PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega EtherII PCC-TD", 0x5261440f, 0xc49bd73d),
1541 PCMCIA_DEVICE_PROD_ID12("Corega K.K.", "corega EtherII PCC-TD", 0xd4fdcbd8, 0xc49bd73d), 1542 PCMCIA_DEVICE_PROD_ID12("Corega K.K.", "corega EtherII PCC-TD", 0xd4fdcbd8, 0xc49bd73d),
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index e2afdce0a437..f0bd1a1aba3a 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -74,8 +74,8 @@
74#define MII_88E1121_PHY_MSCR_TX_DELAY BIT(4) 74#define MII_88E1121_PHY_MSCR_TX_DELAY BIT(4)
75#define MII_88E1121_PHY_MSCR_DELAY_MASK (~(0x3 << 4)) 75#define MII_88E1121_PHY_MSCR_DELAY_MASK (~(0x3 << 4))
76 76
77#define MII_88EC048_PHY_MSCR1_REG 16 77#define MII_88E1318S_PHY_MSCR1_REG 16
78#define MII_88EC048_PHY_MSCR1_PAD_ODD BIT(6) 78#define MII_88E1318S_PHY_MSCR1_PAD_ODD BIT(6)
79 79
80#define MII_88E1121_PHY_LED_CTRL 16 80#define MII_88E1121_PHY_LED_CTRL 16
81#define MII_88E1121_PHY_LED_PAGE 3 81#define MII_88E1121_PHY_LED_PAGE 3
@@ -240,7 +240,7 @@ static int m88e1121_config_aneg(struct phy_device *phydev)
240 return err; 240 return err;
241} 241}
242 242
243static int m88ec048_config_aneg(struct phy_device *phydev) 243static int m88e1318_config_aneg(struct phy_device *phydev)
244{ 244{
245 int err, oldpage, mscr; 245 int err, oldpage, mscr;
246 246
@@ -251,10 +251,10 @@ static int m88ec048_config_aneg(struct phy_device *phydev)
251 if (err < 0) 251 if (err < 0)
252 return err; 252 return err;
253 253
254 mscr = phy_read(phydev, MII_88EC048_PHY_MSCR1_REG); 254 mscr = phy_read(phydev, MII_88E1318S_PHY_MSCR1_REG);
255 mscr |= MII_88EC048_PHY_MSCR1_PAD_ODD; 255 mscr |= MII_88E1318S_PHY_MSCR1_PAD_ODD;
256 256
257 err = phy_write(phydev, MII_88E1121_PHY_MSCR_REG, mscr); 257 err = phy_write(phydev, MII_88E1318S_PHY_MSCR1_REG, mscr);
258 if (err < 0) 258 if (err < 0)
259 return err; 259 return err;
260 260
@@ -659,12 +659,12 @@ static struct phy_driver marvell_drivers[] = {
659 .driver = { .owner = THIS_MODULE }, 659 .driver = { .owner = THIS_MODULE },
660 }, 660 },
661 { 661 {
662 .phy_id = MARVELL_PHY_ID_88EC048, 662 .phy_id = MARVELL_PHY_ID_88E1318S,
663 .phy_id_mask = MARVELL_PHY_ID_MASK, 663 .phy_id_mask = MARVELL_PHY_ID_MASK,
664 .name = "Marvell 88EC048", 664 .name = "Marvell 88E1318S",
665 .features = PHY_GBIT_FEATURES, 665 .features = PHY_GBIT_FEATURES,
666 .flags = PHY_HAS_INTERRUPT, 666 .flags = PHY_HAS_INTERRUPT,
667 .config_aneg = &m88ec048_config_aneg, 667 .config_aneg = &m88e1318_config_aneg,
668 .read_status = &marvell_read_status, 668 .read_status = &marvell_read_status,
669 .ack_interrupt = &marvell_ack_interrupt, 669 .ack_interrupt = &marvell_ack_interrupt,
670 .config_intr = &marvell_config_intr, 670 .config_intr = &marvell_config_intr,
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index e3658e10db39..21314e06e6d7 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -873,7 +873,7 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
873 count = VMXNET3_TXD_NEEDED(skb_headlen(skb)) + 873 count = VMXNET3_TXD_NEEDED(skb_headlen(skb)) +
874 skb_shinfo(skb)->nr_frags + 1; 874 skb_shinfo(skb)->nr_frags + 1;
875 875
876 ctx.ipv4 = (skb->protocol == __constant_ntohs(ETH_P_IP)); 876 ctx.ipv4 = (skb->protocol == cpu_to_be16(ETH_P_IP));
877 877
878 ctx.mss = skb_shinfo(skb)->gso_size; 878 ctx.mss = skb_shinfo(skb)->gso_size;
879 if (ctx.mss) { 879 if (ctx.mss) {
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h
index 8a2f4712284c..edf228843afc 100644
--- a/drivers/net/vmxnet3/vmxnet3_int.h
+++ b/drivers/net/vmxnet3/vmxnet3_int.h
@@ -330,14 +330,14 @@ struct vmxnet3_adapter {
330}; 330};
331 331
332#define VMXNET3_WRITE_BAR0_REG(adapter, reg, val) \ 332#define VMXNET3_WRITE_BAR0_REG(adapter, reg, val) \
333 writel(cpu_to_le32(val), (adapter)->hw_addr0 + (reg)) 333 writel((val), (adapter)->hw_addr0 + (reg))
334#define VMXNET3_READ_BAR0_REG(adapter, reg) \ 334#define VMXNET3_READ_BAR0_REG(adapter, reg) \
335 le32_to_cpu(readl((adapter)->hw_addr0 + (reg))) 335 readl((adapter)->hw_addr0 + (reg))
336 336
337#define VMXNET3_WRITE_BAR1_REG(adapter, reg, val) \ 337#define VMXNET3_WRITE_BAR1_REG(adapter, reg, val) \
338 writel(cpu_to_le32(val), (adapter)->hw_addr1 + (reg)) 338 writel((val), (adapter)->hw_addr1 + (reg))
339#define VMXNET3_READ_BAR1_REG(adapter, reg) \ 339#define VMXNET3_READ_BAR1_REG(adapter, reg) \
340 le32_to_cpu(readl((adapter)->hw_addr1 + (reg))) 340 readl((adapter)->hw_addr1 + (reg))
341 341
342#define VMXNET3_WAKE_QUEUE_THRESHOLD(tq) (5) 342#define VMXNET3_WAKE_QUEUE_THRESHOLD(tq) (5)
343#define VMXNET3_RX_ALLOC_THRESHOLD(rq, ring_idx, adapter) \ 343#define VMXNET3_RX_ALLOC_THRESHOLD(rq, ring_idx, adapter) \