Commit 78e03651 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) Use after free in __dev_map_entry_free(), from Eric Dumazet.

 1) Use after free in __dev_map_entry_free(), from Eric Dumazet.

 2) Fix TCP retransmission timestamps on passive Fast Open, from Yuchung
    Cheng.

 3) Orphan NFC, we'll take the patches directly into my tree. From
    Johannes Berg.

 4) We can't recycle cloned TCP skbs, from Eric Dumazet.

 5) Some flow dissector bpf test fixes, from Stanislav Fomichev.

 6) Fix RCU marking and warnings in rhashtable, from Herbert Xu.

 7) Fix some potential fib6 leaks, from Eric Dumazet.

 8) Fix a _decode_session4 uninitialized memory read bug fix that got
    lost in a merge. From Florian Westphal.

 9) Fix ipv6 source address routing wrt. exception route entries, from
    Wei Wang.

10) The netdev_xmit_more() conversion was not done %100 properly in mlx5
    driver, fix from Tariq Toukan.

11) Clean up botched merge on netfilter kselftest, from Florian
    Westphal.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (74 commits)
  of_net: fix of_get_mac_address retval if compiled without CONFIG_OF
  net: fix kernel-doc warnings for socket.c
  net: Treat sock->sk_drops as an unsigned int when printing
  kselftests: netfilter: fix leftover net/net-next merge conflict
  mlxsw: core: Prevent reading unsupported slave address from SFP EEPROM
  mlxsw: core: Prevent QSFP module initialization for old hardware
  vsock/virtio: Initialize core virtio vsock before registering the driver
  net/mlx5e: Fix possible modify header actions memory leak
  net/mlx5e: Fix no rewrite fields with the same match
  net/mlx5e: Additional check for flow destination comparison
  net/mlx5e: Add missing ethtool driver info for representors
  net/mlx5e: Fix number of vports for ingress ACL configuration
  net/mlx5e: Fix ethtool rxfh commands when CONFIG_MLX5_EN_RXNFC is disabled
  net/mlx5e: Fix wrong xmit_more application
  net/mlx5: Fix peer pf disable hca command
  net/mlx5: E-Switch, Correct type to u16 for vport_num and int for vport_index
  net/mlx5: Add meaningful return codes to status_to_err function
  net/mlx5: Imply MLXFW in mlx5_core
  Revert "tipc: fix modprobe tipc failed after switch order of device registration"
  vsock/virtio: free packets during the socket release
  ...
parents a188339c 6a0a923d

Documentation/bpf/btf.rst

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ The following sections detail encoding of each kind. 
``btf_type`` is followed by a ``u32`` with the following bits arrangement::



  #define BTF_INT_ENCODING(VAL)   (((VAL) & 0x0f000000) >> 24)

  #define BTF_INT_OFFSET(VAL)     (((VAL  & 0x00ff0000)) >> 16)

  #define BTF_INT_OFFSET(VAL)     (((VAL) & 0x00ff0000) >> 16)

  #define BTF_INT_BITS(VAL)       ((VAL)  & 0x000000ff)



The ``BTF_INT_ENCODING`` has the following attributes::

MAINTAINERS

+2 −4
Original line number Diff line number Diff line
@@ -11068,10 +11068,8 @@ S: Supported 
F:	drivers/net/ethernet/qlogic/netxen/



NFC SUBSYSTEM

M:	Samuel Ortiz <sameo@linux.intel.com>

L:	linux-wireless@vger.kernel.org

L:	linux-nfc@lists.01.org (subscribers-only)

S:	Supported

L:	netdev@vger.kernel.org

S:	Orphan

F:	net/nfc/

F:	include/net/nfc/

F:	include/uapi/linux/nfc.h

drivers/atm/iphase.c

+0 −6
Original line number Diff line number Diff line
@@ -2767,12 +2767,6 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg) 
   case MEMDUMP:

   {

	switch (ia_cmds.sub_cmd) {

       	  case MEMDUMP_DEV:     

	     if (!capable(CAP_NET_ADMIN)) return -EPERM;

	     if (copy_to_user(ia_cmds.buf, iadev, sizeof(IADEV)))

                return -EFAULT;

             ia_cmds.status = 0;

             break;

          case MEMDUMP_SEGREG:

	     if (!capable(CAP_NET_ADMIN)) return -EPERM;

             tmps = (u16 __user *)ia_cmds.buf;

drivers/infiniband/hw/mlx5/ib_rep.c

+7 −6
Original line number Diff line number Diff line
@@ -109,15 +109,15 @@ u8 mlx5_ib_eswitch_mode(struct mlx5_eswitch *esw) 
}



struct mlx5_ib_dev *mlx5_ib_get_rep_ibdev(struct mlx5_eswitch *esw,

					  int vport_index)

					  u16 vport_num)

{

	return mlx5_eswitch_get_proto_dev(esw, vport_index, REP_IB);

	return mlx5_eswitch_get_proto_dev(esw, vport_num, REP_IB);

}



struct net_device *mlx5_ib_get_rep_netdev(struct mlx5_eswitch *esw,

					  int vport_index)

					  u16 vport_num)

{

	return mlx5_eswitch_get_proto_dev(esw, vport_index, REP_ETH);

	return mlx5_eswitch_get_proto_dev(esw, vport_num, REP_ETH);

}



struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev(struct mlx5_eswitch *esw)
@@ -125,9 +125,10 @@ struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev(struct mlx5_eswitch *esw) 
	return mlx5_eswitch_uplink_get_proto_dev(esw, REP_IB);

}



struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw, int vport)

struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw,

					   u16 vport_num)

{

	return mlx5_eswitch_vport_rep(esw, vport);

	return mlx5_eswitch_vport_rep(esw, vport_num);

}



struct mlx5_flow_handle *create_flow_rule_vport_sq(struct mlx5_ib_dev *dev,

drivers/infiniband/hw/mlx5/ib_rep.h

+6 −6
Original line number Diff line number Diff line
@@ -14,17 +14,17 @@ extern const struct mlx5_ib_profile uplink_rep_profile; 


u8 mlx5_ib_eswitch_mode(struct mlx5_eswitch *esw);

struct mlx5_ib_dev *mlx5_ib_get_rep_ibdev(struct mlx5_eswitch *esw,

					  int vport_index);

					  u16 vport_num);

struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev(struct mlx5_eswitch *esw);

struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw,

					   int vport_index);

					   u16 vport_num);

void mlx5_ib_register_vport_reps(struct mlx5_core_dev *mdev);

void mlx5_ib_unregister_vport_reps(struct mlx5_core_dev *mdev);

struct mlx5_flow_handle *create_flow_rule_vport_sq(struct mlx5_ib_dev *dev,

						   struct mlx5_ib_sq *sq,

						   u16 port);

struct net_device *mlx5_ib_get_rep_netdev(struct mlx5_eswitch *esw,

					  int vport_index);

					  u16 vport_num);

#else /* CONFIG_MLX5_ESWITCH */

static inline u8 mlx5_ib_eswitch_mode(struct mlx5_eswitch *esw)

{
@@ -33,7 +33,7 @@ static inline u8 mlx5_ib_eswitch_mode(struct mlx5_eswitch *esw) 


static inline

struct mlx5_ib_dev *mlx5_ib_get_rep_ibdev(struct mlx5_eswitch *esw,

					  int vport_index)

					  u16 vport_num)

{

	return NULL;

}
@@ -46,7 +46,7 @@ struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev(struct mlx5_eswitch *esw) 


static inline

struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw,

					   int vport_index)

					   u16 vport_num)

{

	return NULL;

}
@@ -63,7 +63,7 @@ struct mlx5_flow_handle *create_flow_rule_vport_sq(struct mlx5_ib_dev *dev, 


static inline

struct net_device *mlx5_ib_get_rep_netdev(struct mlx5_eswitch *esw,

					  int vport_index)

					  u16 vport_num)

{

	return NULL;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE