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

Commit 96c22a49 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) The forcedeth conversion from pci_*() DMA interfaces to dma_*() ones
    missed one spot. From Zhu Yanjun.

 2) Missing CRYPTO_SHA256 Kconfig dep in cfg80211, from Johannes Berg.

 3) Fix checksum offloading in thunderx driver, from Sunil Goutham.

 4) Add SPDX to vm_sockets_diag.h, from Stephen Hemminger.

 5) Fix use after free of packet headers in TIPC, from Jon Maloy.

 6) "sizeof(ptr)" vs "sizeof(*ptr)" bug in i40e, from Gustavo A R Silva.

 7) Tunneling fixes in mlxsw driver, from Petr Machata.

 8) Fix crash in fanout_demux_rollover() of AF_PACKET, from Mike
    Maloney.

 9) Fix race in AF_PACKET bind() vs. NETDEV_UP notifier, from Eric
    Dumazet.

10) Fix regression in sch_sfq.c due to one of the timer_setup()
    conversions. From Paolo Abeni.

11) SCTP does list_for_each_entry() using wrong struct member, fix from
    Xin Long.

12) Don't use big endian netlink attribute read for
    IFLA_BOND_AD_ACTOR_SYSTEM, it is in cpu endianness. Also from Xin
    Long.

13) Fix mis-initialization of q->link.clock in CBQ scheduler, preventing
    adding filters there. From Jiri Pirko.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (67 commits)
  ethernet: dwmac-stm32: Fix copyright
  net: via: via-rhine: use %p to format void * address instead of %x
  net: ethernet: xilinx: Mark XILINX_LL_TEMAC broken on 64-bit
  myri10ge: Update MAINTAINERS
  net: sched: cbq: create block for q->link.block
  atm: suni: remove extraneous space to fix indentation
  atm: lanai: use %p to format kernel addresses instead of %x
  VSOCK: Don't set sk_state to TCP_CLOSE before testing it
  atm: fore200e: use %pK to format kernel addresses instead of %x
  ambassador: fix incorrect indentation of assignment statement
  vxlan: use __be32 type for the param vni in __vxlan_fdb_delete
  bonding: use nla_get_u64 to extract the value for IFLA_BOND_AD_ACTOR_SYSTEM
  sctp: use right member as the param of list_for_each_entry
  sch_sfq: fix null pointer dereference at timer expiration
  cls_bpf: don't decrement net's refcount when offload fails
  net/packet: fix a race in packet_bind() and packet_notifier()
  packet: fix crash in fanout_demux_rollover()
  sctp: remove extern from stream sched
  sctp: force the params with right types for sctp csum apis
  sctp: force SCTP_ERROR_INV_STRM with __u32 when calling sctp_chunk_fail
  ...
parents ef0010a3 f6454f80

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -9331,9 +9331,9 @@ F: drivers/gpu/drm/mxsfb/ 
F:	Documentation/devicetree/bindings/display/mxsfb-drm.txt



MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)

M:	Hyong-Youb Kim <hykim@myri.com>

M:	Chris Lee <christopher.lee@cspi.com>

L:	netdev@vger.kernel.org

W:	https://www.myricom.com/support/downloads/myri10ge.html

W:	https://www.cspi.com/ethernet-products/support/downloads/

S:	Supported

F:	drivers/net/ethernet/myricom/myri10ge/

drivers/atm/fore200e.c

+2 −2
Original line number Diff line number Diff line
@@ -3083,8 +3083,8 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page) 
	    ASSERT(fore200e_vcc);



	    len = sprintf(page,

			  "  %08x  %03d %05d %1d   %09lu %05d/%05d      %09lu %05d/%05d\n",

			  (u32)(unsigned long)vcc,

			  "  %pK  %03d %05d %1d   %09lu %05d/%05d      %09lu %05d/%05d\n",

			  vcc,

			  vcc->vpi, vcc->vci, fore200e_atm2fore_aal(vcc->qos.aal),

			  fore200e_vcc->tx_pdu,

			  fore200e_vcc->tx_min_pdu > 0xFFFF ? 0 : fore200e_vcc->tx_min_pdu,

drivers/atm/lanai.c

+4 −4
Original line number Diff line number Diff line
@@ -1586,8 +1586,8 @@ static int service_buffer_allocate(struct lanai_dev *lanai) 
	    lanai->pci);

	if (unlikely(lanai->service.start == NULL))

		return -ENOMEM;

	DPRINTK("allocated service buffer at 0x%08lX, size %zu(%d)\n",

	    (unsigned long) lanai->service.start,

	DPRINTK("allocated service buffer at %p, size %zu(%d)\n",

	    lanai->service.start,

	    lanai_buf_size(&lanai->service),

	    lanai_buf_size_cardorder(&lanai->service));

	/* Clear ServWrite register to be safe */
@@ -2218,9 +2218,9 @@ static int lanai_dev_open(struct atm_dev *atmdev) 
#endif

	memcpy(atmdev->esi, eeprom_mac(lanai), ESI_LEN);

	lanai_timed_poll_start(lanai);

	printk(KERN_NOTICE DEV_LABEL "(itf %d): rev.%d, base=0x%lx, irq=%u "

	printk(KERN_NOTICE DEV_LABEL "(itf %d): rev.%d, base=%p, irq=%u "

		"(%pMF)\n", lanai->number, (int) lanai->pci->revision,

		(unsigned long) lanai->base, lanai->pci->irq, atmdev->esi);

		lanai->base, lanai->pci->irq, atmdev->esi);

	printk(KERN_NOTICE DEV_LABEL "(itf %d): LANAI%s, serialno=%u(0x%X), "

	    "board_rev=%d\n", lanai->number,

	    lanai->type==lanai2 ? "2" : "HB", (unsigned int) lanai->serialno,

drivers/net/bonding/bond_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[], 
			return -EINVAL;



		bond_opt_initval(&newval,

				 nla_get_be64(data[IFLA_BOND_AD_ACTOR_SYSTEM]));

				 nla_get_u64(data[IFLA_BOND_AD_ACTOR_SYSTEM]));

		err = __bond_opt_set(bond, BOND_OPT_AD_ACTOR_SYSTEM, &newval);

		if (err)

			return err;

drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -2136,8 +2136,8 @@ static int bnxt_get_module_eeprom(struct net_device *dev, 
	/* Read A2 portion of the EEPROM */

	if (length) {

		start -= ETH_MODULE_SFF_8436_LEN;

		bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A2, 1, start,

						 length, data);

		rc = bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A2, 1,

						      start, length, data);

	}

	return rc;

}