Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 23 Sep 2016 10:46:57 +0000 (06:46 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 23 Sep 2016 10:46:57 +0000 (06:46 -0400)
43 files changed:
1  2 
MAINTAINERS
arch/arm64/boot/dts/apm/apm-storm.dtsi
drivers/infiniband/hw/cxgb4/cm.c
drivers/infiniband/hw/cxgb4/device.c
drivers/infiniband/hw/cxgb4/iw_cxgb4.h
drivers/infiniband/hw/mlx5/main.c
drivers/net/ethernet/broadcom/bnx2.c
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h
drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c
drivers/net/ethernet/ibm/emac/core.c
drivers/net/ethernet/mediatek/mtk_eth_soc.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c
drivers/net/ethernet/netronome/nfp/nfp_net_common.c
drivers/net/ethernet/qlogic/qed/qed_mcp.c
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
drivers/net/usb/r8152.c
drivers/net/wireless/intel/iwlwifi/mvm/tx.c
drivers/net/xen-netback/xenbus.c
include/net/sock.h
include/net/xfrm.h
kernel/events/core.c
net/batman-adv/routing.c
net/core/sock.c
net/ipv4/route.c
net/ipv4/tcp_input.c
net/ipv4/tcp_output.c
net/ipv6/ip6_vti.c
net/ipv6/route.c
net/irda/af_irda.c
net/mac80211/agg-rx.c
net/mac80211/mesh_hwmp.c
net/mac80211/sta_info.c
net/mac80211/tx.c
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_nat_core.c
net/sctp/input.c
net/wireless/nl80211.c
net/xfrm/xfrm_state.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 1be4d235a576ddee4f7223af594df0d854429fae,3ceafb55d6da704a3c235012877f6a12bb54dfdd..eaa7fa98a205f308aa4e03c668b125cfcec7e908
@@@ -3971,12 -4305,29 +3971,19 @@@ static const struct pci_error_handlers 
        .resume         = eeh_resume,
  };
  
+ /* Return true if the Link Configuration supports "High Speeds" (those greater
+  * than 1Gb/s).
+  */
  static inline bool is_x_10g_port(const struct link_config *lc)
  {
-       return (lc->supported & FW_PORT_CAP_SPEED_10G) != 0 ||
-              (lc->supported & FW_PORT_CAP_SPEED_40G) != 0;
+       unsigned int speeds, high_speeds;
+       speeds = FW_PORT_CAP_SPEED_V(FW_PORT_CAP_SPEED_G(lc->supported));
+       high_speeds = speeds & ~(FW_PORT_CAP_SPEED_100M | FW_PORT_CAP_SPEED_1G);
+       return high_speeds != 0;
  }
  
 -static inline void init_rspq(struct adapter *adap, struct sge_rspq *q,
 -                           unsigned int us, unsigned int cnt,
 -                           unsigned int size, unsigned int iqe_size)
 -{
 -      q->adap = adap;
 -      cxgb4_set_rspq_intr_params(q, us, cnt);
 -      q->iqe_len = iqe_size;
 -      q->size = size;
 -}
 -
  /*
   * Perform default configuration of DMA queues depending on the number and type
   * of ports we found and the number of available CPUs.  Most settings can be
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/sock.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge