Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3985c7ce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents fcf744a9 ce384d91

drivers/isdn/mISDN/socket.c

+2 −0
Original line number Diff line number Diff line
@@ -392,6 +392,7 @@ data_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 
		if (dev) {

			struct mISDN_devinfo di;



			memset(&di, 0, sizeof(di));

			di.id = dev->id;

			di.Dprotocols = dev->Dprotocols;

			di.Bprotocols = dev->Bprotocols | get_all_Bprotocols();
@@ -672,6 +673,7 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 
		if (dev) {

			struct mISDN_devinfo di;



			memset(&di, 0, sizeof(di));

			di.id = dev->id;

			di.Dprotocols = dev->Dprotocols;

			di.Bprotocols = dev->Bprotocols | get_all_Bprotocols();

drivers/net/can/at91_can.c

+1 −1
Original line number Diff line number Diff line 
/*

 * at91_can.c - CAN network driver for AT91 SoC CAN controller

 *

 * (C) 2007 by Hans J. Koch <hjk@linutronix.de>

 * (C) 2007 by Hans J. Koch <hjk@hansjkoch.de>

 * (C) 2008, 2009, 2010 by Marc Kleine-Budde <kernel@pengutronix.de>

 *

 * This software may be distributed under the terms of the GNU General

drivers/net/can/pch_can.c

+5 −5
Original line number Diff line number Diff line
@@ -213,12 +213,12 @@ static DEFINE_PCI_DEVICE_TABLE(pch_pci_tbl) = { 
};

MODULE_DEVICE_TABLE(pci, pch_pci_tbl);



static inline void pch_can_bit_set(u32 *addr, u32 mask)

static inline void pch_can_bit_set(void __iomem *addr, u32 mask)

{

	iowrite32(ioread32(addr) | mask, addr);

}



static inline void pch_can_bit_clear(u32 *addr, u32 mask)

static inline void pch_can_bit_clear(void __iomem *addr, u32 mask)

{

	iowrite32(ioread32(addr) & ~mask, addr);

}
@@ -1437,7 +1437,7 @@ static int __devinit pch_can_probe(struct pci_dev *pdev, 
	return rc;

}



static struct pci_driver pch_can_pcidev = {

static struct pci_driver pch_can_pci_driver = {

	.name = "pch_can",

	.id_table = pch_pci_tbl,

	.probe = pch_can_probe,
@@ -1448,13 +1448,13 @@ static struct pci_driver pch_can_pcidev = { 


static int __init pch_can_pci_init(void)

{

	return pci_register_driver(&pch_can_pcidev);

	return pci_register_driver(&pch_can_pci_driver);

}

module_init(pch_can_pci_init);



static void __exit pch_can_pci_exit(void)

{

	pci_unregister_driver(&pch_can_pcidev);

	pci_unregister_driver(&pch_can_pci_driver);

}

module_exit(pch_can_pci_exit);

drivers/net/netxen/netxen_nic_main.c

+0 −1
Original line number Diff line number Diff line
@@ -1240,7 +1240,6 @@ netxen_setup_netdev(struct netxen_adapter *adapter, 
		dev_warn(&pdev->dev, "failed to read mac addr\n");



	netif_carrier_off(netdev);

	netif_stop_queue(netdev);



	err = register_netdev(netdev);

	if (err) {

drivers/net/pcmcia/pcnet_cs.c

+1 −0
Original line number Diff line number Diff line
@@ -1536,6 +1536,7 @@ static struct pcmcia_device_id pcnet_ids[] = { 
	PCMCIA_DEVICE_PROD_ID12("COMPU-SHACK", "FASTline PCMCIA 10/100 Fast-Ethernet", 0xfa2e424d, 0x3953d9b9),

	PCMCIA_DEVICE_PROD_ID12("CONTEC", "C-NET(PC)C-10L", 0x21cab552, 0xf6f90722),

	PCMCIA_DEVICE_PROD_ID12("corega", "FEther PCC-TXF", 0x0a21501a, 0xa51564a2),

	PCMCIA_DEVICE_PROD_ID12("corega", "Ether CF-TD", 0x0a21501a, 0x6589340a),

	PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega EtherII PCC-T", 0x5261440f, 0xfa9d85bd),

	PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega EtherII PCC-TD", 0x5261440f, 0xc49bd73d),

	PCMCIA_DEVICE_PROD_ID12("Corega K.K.", "corega EtherII PCC-TD", 0xd4fdcbd8, 0xc49bd73d),