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

Commit 9cb5b787 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma 

Pull rdma fixes from Doug Ledford:
 "I'm back from PTO.  These issues cropped up while I was gone and are
  simple fixes.  I'll have more after I've caught up, but I wanted to
  get these in quick.

  Two minor fixes for 4.6-rc2:

   - Fix mlx5 build error when on demand paging is not enabled

   - Fix possible uninit variable in new i40iw driver"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  i40iw: avoid potential uninitialized variable use
  IB/mlx5: fix VFs callback function prototypes
parents 541d8f4d 2fe78571

drivers/infiniband/hw/i40iw/i40iw_cm.c

+3 −7
Original line number Diff line number Diff line
@@ -1992,7 +1992,6 @@ static int i40iw_addr_resolve_neigh(struct i40iw_device *iwdev, 
/**

 * i40iw_get_dst_ipv6

 */

#if IS_ENABLED(CONFIG_IPV6)

static struct dst_entry *i40iw_get_dst_ipv6(struct sockaddr_in6 *src_addr,

					    struct sockaddr_in6 *dst_addr)

{
@@ -2008,7 +2007,6 @@ static struct dst_entry *i40iw_get_dst_ipv6(struct sockaddr_in6 *src_addr, 
	dst = ip6_route_output(&init_net, NULL, &fl6);

	return dst;

}

#endif



/**

 * i40iw_addr_resolve_neigh_ipv6 - resolve neighbor ipv6 address
@@ -2016,7 +2014,6 @@ static struct dst_entry *i40iw_get_dst_ipv6(struct sockaddr_in6 *src_addr, 
 * @dst_ip: remote ip address

 * @arpindex: if there is an arp entry

 */

#if IS_ENABLED(CONFIG_IPV6)

static int i40iw_addr_resolve_neigh_ipv6(struct i40iw_device *iwdev,

					 u32 *src,

					 u32 *dest,
@@ -2089,7 +2086,6 @@ static int i40iw_addr_resolve_neigh_ipv6(struct i40iw_device *iwdev, 
	dst_release(dst);

	return rc;

}

#endif



/**

 * i40iw_ipv4_is_loopback - check if loopback
@@ -2190,13 +2186,13 @@ static struct i40iw_cm_node *i40iw_make_cm_node( 
							    cm_info->loc_addr[0],

							    cm_info->rem_addr[0],

							    oldarpindex);

#if IS_ENABLED(CONFIG_IPV6)

		else

		else if (IS_ENABLED(CONFIG_IPV6))

			arpindex = i40iw_addr_resolve_neigh_ipv6(iwdev,

								 cm_info->loc_addr,

								 cm_info->rem_addr,

								 oldarpindex);

#endif

		else

			arpindex = -EINVAL;

	}

	if (arpindex < 0) {

		i40iw_pr_err("cm_node arpindex\n");

drivers/infiniband/hw/mlx5/mlx5_ib.h

+9 −9
Original line number Diff line number Diff line
@@ -776,15 +776,6 @@ void mlx5_ib_qp_disable_pagefaults(struct mlx5_ib_qp *qp); 
void mlx5_ib_qp_enable_pagefaults(struct mlx5_ib_qp *qp);

void mlx5_ib_invalidate_range(struct ib_umem *umem, unsigned long start,

			      unsigned long end);

int mlx5_ib_get_vf_config(struct ib_device *device, int vf,

			  u8 port, struct ifla_vf_info *info);

int mlx5_ib_set_vf_link_state(struct ib_device *device, int vf,

			      u8 port, int state);

int mlx5_ib_get_vf_stats(struct ib_device *device, int vf,

			 u8 port, struct ifla_vf_stats *stats);

int mlx5_ib_set_vf_guid(struct ib_device *device, int vf, u8 port,

			u64 guid, int type);



#else /* CONFIG_INFINIBAND_ON_DEMAND_PAGING */

static inline void mlx5_ib_internal_fill_odp_caps(struct mlx5_ib_dev *dev)

{
@@ -801,6 +792,15 @@ static inline void mlx5_ib_qp_enable_pagefaults(struct mlx5_ib_qp *qp) {} 


#endif /* CONFIG_INFINIBAND_ON_DEMAND_PAGING */



int mlx5_ib_get_vf_config(struct ib_device *device, int vf,

			  u8 port, struct ifla_vf_info *info);

int mlx5_ib_set_vf_link_state(struct ib_device *device, int vf,

			      u8 port, int state);

int mlx5_ib_get_vf_stats(struct ib_device *device, int vf,

			 u8 port, struct ifla_vf_stats *stats);

int mlx5_ib_set_vf_guid(struct ib_device *device, int vf, u8 port,

			u64 guid, int type);



__be16 mlx5_get_roce_udp_sport(struct mlx5_ib_dev *dev, u8 port_num,

			       int index);