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

Commit 8e500ff8 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: (22 commits)
  gianfar: Fix potential oops during OF address translation
  fsl_pq_mdio: Fix kernel oops during OF address translation
  tcp: bind() fix when many ports are bound
  rdma: potential ERR_PTR dereference
  rtnetlink: potential ERR_PTR dereference
  net: ipv6 bind to device issue
  ipv6: allow to send packet after receiving ICMPv6 Too Big message with MTU field less than IPV6_MIN_MTU
  drivers/net/usb: Add new driver ipheth
  cxgb3: fix linkup issue
  X25 fix dead unaccepted sockets
  KS8851: NULL pointer dereference if list is empty
  net: 3c574_cs fix stats.tx_bytes counter
  xfrm6: ensure to use the same dev when building a bundle
  can: Fix possible NULL pointer dereference in ems_usb.c
  net: Fix an RCU warning in dev_pick_tx()
  ipv6: Fix tcp_v6_send_response transport header setting.
  bridge: add a missing ntohs()
  8139too: Fix a typo in the function name.
  mac80211: pass HT changes to driver when off channel
  mac80211: remove bogus TX agg state assignment
  ...
parents 383bee6b 7ce97d4f

drivers/net/8139too.c

+1 −1
Original line number Diff line number Diff line
@@ -1944,7 +1944,7 @@ static int rtl8139_rx(struct net_device *dev, struct rtl8139_private *tp, 
		netif_dbg(tp, rx_status, dev, "%s() status %04x, size %04x, cur %04x\n",

			  __func__, rx_status, rx_size, cur_rx);

#if RTL8139_DEBUG > 2

		print_dump_hex(KERN_DEBUG, "Frame contents: ",

		print_hex_dump(KERN_DEBUG, "Frame contents: ",

			       DUMP_PREFIX_OFFSET, 16, 1,

			       &rx_ring[ring_offset], 70, true);

#endif

drivers/net/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ obj-$(CONFIG_USB_RTL8150) += usb/ 
obj-$(CONFIG_USB_HSO)		+= usb/

obj-$(CONFIG_USB_USBNET)        += usb/

obj-$(CONFIG_USB_ZD1201)        += usb/

obj-$(CONFIG_USB_IPHETH)        += usb/



obj-y += wireless/

obj-$(CONFIG_NET_TULIP) += tulip/

drivers/net/can/usb/ems_usb.c

+4 −4
Original line number Diff line number Diff line
@@ -1006,7 +1006,7 @@ static int ems_usb_probe(struct usb_interface *intf, 


	netdev = alloc_candev(sizeof(struct ems_usb), MAX_TX_URBS);

	if (!netdev) {

		dev_err(netdev->dev.parent, "Couldn't alloc candev\n");

		dev_err(&intf->dev, "ems_usb: Couldn't alloc candev\n");

		return -ENOMEM;

	}
@@ -1036,20 +1036,20 @@ static int ems_usb_probe(struct usb_interface *intf, 


	dev->intr_urb = usb_alloc_urb(0, GFP_KERNEL);

	if (!dev->intr_urb) {

		dev_err(netdev->dev.parent, "Couldn't alloc intr URB\n");

		dev_err(&intf->dev, "Couldn't alloc intr URB\n");

		goto cleanup_candev;

	}



	dev->intr_in_buffer = kzalloc(INTR_IN_BUFFER_SIZE, GFP_KERNEL);

	if (!dev->intr_in_buffer) {

		dev_err(netdev->dev.parent, "Couldn't alloc Intr buffer\n");

		dev_err(&intf->dev, "Couldn't alloc Intr buffer\n");

		goto cleanup_intr_urb;

	}



	dev->tx_msg_buffer = kzalloc(CPC_HEADER_SIZE +

				     sizeof(struct ems_cpc_msg), GFP_KERNEL);

	if (!dev->tx_msg_buffer) {

		dev_err(netdev->dev.parent, "Couldn't alloc Tx buffer\n");

		dev_err(&intf->dev, "Couldn't alloc Tx buffer\n");

		goto cleanup_intr_in_buffer;

	}

drivers/net/cxgb3/ael1002.c

+1 −1
Original line number Diff line number Diff line
@@ -934,7 +934,7 @@ static struct cphy_ops xaui_direct_ops = { 
int t3_xaui_direct_phy_prep(struct cphy *phy, struct adapter *adapter,

			    int phy_addr, const struct mdio_ops *mdio_ops)

{

	cphy_init(phy, adapter, MDIO_PRTAD_NONE, &xaui_direct_ops, mdio_ops,

	cphy_init(phy, adapter, phy_addr, &xaui_direct_ops, mdio_ops,

		  SUPPORTED_10000baseT_Full | SUPPORTED_AUI | SUPPORTED_TP,

		  "10GBASE-CX4");

	return 0;

drivers/net/fsl_pq_mdio.c

+14 −6
Original line number Diff line number Diff line
@@ -205,8 +205,6 @@ static int fsl_pq_mdio_find_free(struct mii_bus *new_bus) 
static u32 __iomem *get_gfar_tbipa(struct fsl_pq_mdio __iomem *regs, struct device_node *np)

{

	struct gfar __iomem *enet_regs;

	u32 __iomem *ioremap_tbipa;

	u64 addr, size;



	/*

	 * This is mildly evil, but so is our hardware for doing this.
@@ -220,9 +218,7 @@ static u32 __iomem *get_gfar_tbipa(struct fsl_pq_mdio __iomem *regs, struct devi 
		return &enet_regs->tbipa;

	} else if (of_device_is_compatible(np, "fsl,etsec2-mdio") ||

			of_device_is_compatible(np, "fsl,etsec2-tbi")) {

		addr = of_translate_address(np, of_get_address(np, 1, &size, NULL));

		ioremap_tbipa = ioremap(addr, size);

		return ioremap_tbipa;

		return of_iomap(np, 1);

	} else

		return NULL;

}
@@ -279,6 +275,7 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev, 
	u32 __iomem *tbipa;

	struct mii_bus *new_bus;

	int tbiaddr = -1;

	const u32 *addrp;

	u64 addr = 0, size = 0;

	int err = 0;
@@ -297,8 +294,19 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev, 
	new_bus->priv = priv;

	fsl_pq_mdio_bus_name(new_bus->id, np);



	addrp = of_get_address(np, 0, &size, NULL);

	if (!addrp) {

		err = -EINVAL;

		goto err_free_bus;

	}



	/* Set the PHY base address */

	addr = of_translate_address(np, of_get_address(np, 0, &size, NULL));

	addr = of_translate_address(np, addrp);

	if (addr == OF_BAD_ADDR) {

		err = -EINVAL;

		goto err_free_bus;

	}



	map = ioremap(addr, size);

	if (!map) {

		err = -ENOMEM;