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

Commit c356dc4b 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) Fix leak of unqueued fragments in ipv6 nf_defrag, from Guillaume
    Nault.

 2) Don't access the DDM interface unless the transceiver implements it
    in bnx2x, from Mauro S. M. Rodrigues.

 3) Don't double fetch 'len' from userspace in sock_getsockopt(), from
    JingYi Hou.

 4) Sign extension overflow in lio_core, from Colin Ian King.

 5) Various netem bug fixes wrt. corrupted packets from Jakub Kicinski.

 6) Fix epollout hang in hvsock, from Sunil Muthuswamy.

 7) Fix regression in default fib6_type, from David Ahern.

 8) Handle memory limits in tcp_fragment more appropriately, from Eric
    Dumazet.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (24 commits)
  tcp: refine memory limit test in tcp_fragment()
  inet: clear num_timeout reqsk_alloc()
  net: mvpp2: debugfs: Add pmap to fs dump
  ipv6: Default fib6_type to RTN_UNICAST when not set
  net: hns3: Fix inconsistent indenting
  net/af_iucv: always register net_device notifier
  net/af_iucv: build proper skbs for HiperTransport
  net/af_iucv: remove GFP_DMA restriction for HiperTransport
  net: dsa: mv88e6xxx: fix shift of FID bits in mv88e6185_g1_vtu_loadpurge()
  hvsock: fix epollout hang from race condition
  net/udp_gso: Allow TX timestamp with UDP GSO
  net: netem: fix use after free and double free with packet corruption
  net: netem: fix backlog accounting for corrupted GSO frames
  net: lio_core: fix potential sign-extension overflow on large shift
  tipc: pass tunnel dev as NULL to udp_tunnel(6)_xmit_skb
  ip6_tunnel: allow not to count pkts on tstats by passing dev as NULL
  ip_tunnel: allow not to count pkts on tstats by setting skb's dev to NULL
  tun: wake up waitqueues after IFF_UP is set
  net: remove duplicate fetch in sock_getsockopt
  tipc: fix issues with early FAILOVER_MSG from peer
  ...
parents 121bddf3 b6653b36

drivers/net/dsa/mv88e6xxx/global1_vtu.c

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ int mv88e6185_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip, 
		 * VTU DBNum[7:4] are located in VTU Operation 11:8

		 */

		op |= entry->fid & 0x000f;

		op |= (entry->fid & 0x00f0) << 8;

		op |= (entry->fid & 0x00f0) << 4;

	}



	return mv88e6xxx_g1_vtu_op(chip, op);

drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

+2 −1
Original line number Diff line number Diff line
@@ -1609,7 +1609,8 @@ static int bnx2x_get_module_info(struct net_device *dev, 
	}



	if (!sff8472_comp ||

	    (diag_type & SFP_EEPROM_DIAG_ADDR_CHANGE_REQ)) {

	    (diag_type & SFP_EEPROM_DIAG_ADDR_CHANGE_REQ) ||

	    !(diag_type & SFP_EEPROM_DDM_IMPLEMENTED)) {

		modinfo->type = ETH_MODULE_SFF_8079;

		modinfo->eeprom_len = ETH_MODULE_SFF_8079_LEN;

	} else {

drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ 
#define SFP_EEPROM_DIAG_TYPE_ADDR		0x5c

#define SFP_EEPROM_DIAG_TYPE_SIZE		1

#define SFP_EEPROM_DIAG_ADDR_CHANGE_REQ		(1<<2)

#define SFP_EEPROM_DDM_IMPLEMENTED		(1<<6)

#define SFP_EEPROM_SFF_8472_COMP_ADDR		0x5e

#define SFP_EEPROM_SFF_8472_COMP_SIZE		1

drivers/net/ethernet/cavium/liquidio/lio_core.c

+1 −1
Original line number Diff line number Diff line
@@ -964,7 +964,7 @@ static void liquidio_schedule_droq_pkt_handlers(struct octeon_device *oct) 


			if (droq->ops.poll_mode) {

				droq->ops.napi_fn(droq);

				oct_priv->napi_mask |= (1 << oq_no);

				oct_priv->napi_mask |= BIT_ULL(oq_no);

			} else {

				tasklet_schedule(&oct_priv->droq_tasklet);

			}

drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c

+3 −0
Original line number Diff line number Diff line
@@ -566,6 +566,9 @@ static int mvpp2_dbgfs_prs_entry_init(struct dentry *parent, 
	debugfs_create_file("hits", 0444, prs_entry_dir, entry,

			    &mvpp2_dbgfs_prs_hits_fops);



	debugfs_create_file("pmap", 0444, prs_entry_dir, entry,

			     &mvpp2_dbgfs_prs_pmap_fops);



	return 0;

}