From: David S. Miller <davem@davemloft.net>
Date: Fri, 23 Sep 2016 10:46:57 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.9-rc1~127^2~92
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=d6989d4bbe6c4d1c2a76696833a07f044e85694d

Merge git://git./linux/kernel/git/davem/net
---

d6989d4bbe6c4d1c2a76696833a07f044e85694d
diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 1be4d235a576,3ceafb55d6da..eaa7fa98a205
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@@ -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