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

Commit 8a109446 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 

Pull networking fixes from David Miller:

 1) OpenVswitch's lookup_datapath() returns error pointers, so don't
    check against NULL.  From Jiri Pirko.

 2) pfkey_compile_policy() code path tries to do a GFP_KERNEL allocation
    under RCU locks, fix by using GFP_ATOMIC when necessary.  From
    Nikolay Aleksandrov.

 3) phy_suspend() indirectly passes uninitialized data into the ethtool
    get wake-on-land implementations.  Fix from Sebastian Hesselbarth.

 4) CPSW driver unregisters CPTS twice, fix from Benedikt Spranger.

 5) If SKB allocation of reply packet fails, vxlan's arp_reduce() defers
    a NULL pointer.  Fix from David Stevens.

 6) IPV6 neigh handling in vxlan doesn't validate the destination
    address properly, and it builds a packet with the src and dst
    reversed.  Fix also from David Stevens.

 7) Fix spinlock recursion during subscription failures in TIPC stack,
    from Erik Hugne.

 8) Revert buggy conversion of davinci_emac to devm_request_irq, from
    Chrstian Riesch.

 9) Wrong flags passed into forwarding database netlink notifications,
    from Nicolas Dichtel.

10) The netpoll neighbour soliciation handler checks wrong ethertype,
    needs to be ETH_P_IPV6 rather than ETH_P_ARP.  Fix from Li RongQing.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (34 commits)
  tipc: fix spinlock recursion bug for failed subscriptions
  vxlan: fix nonfunctional neigh_reduce()
  net: davinci_emac: Fix rollback of emac_dev_open()
  net: davinci_emac: Replace devm_request_irq with request_irq
  netpoll: fix the skb check in pkt_is_ns
  net: micrel : ks8851-ml: add vdd-supply support
  ip6mr: fix mfc notification flags
  ipmr: fix mfc notification flags
  rtnetlink: fix fdb notification flags
  tcp: syncookies: do not use getnstimeofday()
  netlink: fix setsockopt in mmap examples in documentation
  openvswitch: Correctly report flow used times for first 5 minutes after boot.
  via-rhine: Disable device in error path
  ATHEROS-ATL1E: Convert iounmap to pci_iounmap
  vxlan: fix potential NULL dereference in arp_reduce()
  cnic: Update version to 2.5.20 and copyright year.
  cnic,bnx2i,bnx2fc: Fix inconsistent use of page size
  cnic: Use proper ulp_ops for per device operations.
  net: cdc_ncm: fix control message ordering
  ipv6: ip6_append_data_mtu do not handle the mtu of the second fragment properly
  ...
parents 774868c7 a5d0e7c0

Documentation/devicetree/bindings/net/micrel-ks8851.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ Required properties: 


Optional properties:

- local-mac-address : Ethernet mac address to use

- vdd-supply:	supply for Ethernet mac

Documentation/networking/netlink_mmap.txt

+2 −2
Original line number Diff line number Diff line
@@ -226,9 +226,9 @@ Ring setup: 
	void *rx_ring, *tx_ring;



	/* Configure ring parameters */

	if (setsockopt(fd, NETLINK_RX_RING, &req, sizeof(req)) < 0)

	if (setsockopt(fd, SOL_NETLINK, NETLINK_RX_RING, &req, sizeof(req)) < 0)

		exit(1);

	if (setsockopt(fd, NETLINK_TX_RING, &req, sizeof(req)) < 0)

	if (setsockopt(fd, SOL_NETLINK, NETLINK_TX_RING, &req, sizeof(req)) < 0)

		exit(1)



	/* Calculate size of each individual ring */

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4545,6 +4545,7 @@ M: Greg Rose <gregory.v.rose@intel.com> 
M:	Alex Duyck <alexander.h.duyck@intel.com>

M:	John Ronciak <john.ronciak@intel.com>

M:	Mitch Williams <mitch.a.williams@intel.com>

M:	Linux NICS <linux.nics@intel.com>

L:	e1000-devel@lists.sourceforge.net

W:	http://www.intel.com/support/feedback.htm

W:	http://e1000.sourceforge.net/

drivers/isdn/capi/Kconfig

+9 −9
Original line number Diff line number Diff line
@@ -16,9 +16,17 @@ config CAPI_TRACE 
	  This will increase the size of the kernelcapi module by 20 KB.

	  If unsure, say Y.



config ISDN_CAPI_CAPI20

	tristate "CAPI2.0 /dev/capi support"

	help

	  This option will provide the CAPI 2.0 interface to userspace

	  applications via /dev/capi20. Applications should use the

	  standardized libcapi20 to access this functionality.  You should say

	  Y/M here.



config ISDN_CAPI_MIDDLEWARE

	bool "CAPI2.0 Middleware support"

	depends on TTY

	depends on ISDN_CAPI_CAPI20 && TTY

	help

	  This option will enhance the capabilities of the /dev/capi20

	  interface.  It will provide a means of moving a data connection,
@@ -26,14 +34,6 @@ config ISDN_CAPI_MIDDLEWARE 
	  device.  If you want to use pppd with pppdcapiplugin to dial up to

	  your ISP, say Y here.



config ISDN_CAPI_CAPI20

	tristate "CAPI2.0 /dev/capi support"

	help

	  This option will provide the CAPI 2.0 interface to userspace

	  applications via /dev/capi20. Applications should use the

	  standardized libcapi20 to access this functionality.  You should say

	  Y/M here.



config ISDN_CAPI_CAPIDRV

	tristate "CAPI2.0 capidrv interface support"

	depends on ISDN_I4L

drivers/net/ethernet/atheros/alx/main.c

+4 −10
Original line number Diff line number Diff line
@@ -1248,21 +1248,15 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	 * shared register for the high 32 bits, so only a single, aligned,

	 * 4 GB physical address range can be used for descriptors.

	 */

	if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&

	    !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {

	if (!dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64))) {

		dev_dbg(&pdev->dev, "DMA to 64-BIT addresses\n");

	} else {

		err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));

		err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

		if (err) {

			err = dma_set_coherent_mask(&pdev->dev,

						    DMA_BIT_MASK(32));

			if (err) {

				dev_err(&pdev->dev,

					"No usable DMA config, aborting\n");

			dev_err(&pdev->dev, "No usable DMA config, aborting\n");

			goto out_pci_disable;

		}

	}

	}



	bars = pci_select_bars(pdev, IORESOURCE_MEM);

	err = pci_request_selected_regions(pdev, bars, alx_drv_name);