[net-next 0/2][pull request] 100GbE Intel Wired LAN Driver Updates 2016-10-02

[net-next 0/2][pull request] 100GbE Intel Wired LAN Driver Updates 2016-10-02

[Jeff Kirsher]

This series contains updates to fm10k only.

Jake fixes an issue where PTP applications requesting software timestamps
may complain that the requested mode is not supported, so add a generic
callback for those drivers that have software transmit timestamp support
enabled.  Then provides a trivial cleanup where a code was not wrapped
properly.  Got make sure that code looks good in a 80 character limit.

The following are changes since commit 7c70c4f8b2bf5ed777120f3d70efe35e64930c10:
  cxgb4: unexport cxgb4_dcb_enabled
and are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 100GbE

Jacob Keller (2):
  fm10k: use generic ethtool_op_get_ts_info callback
  fm10k: wrap long line for alloc_workqueue

 drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 1 +
 drivers/net/ethernet/intel/fm10k/fm10k_main.c    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

-- 
2.7.4

[net-next 1/2] fm10k: use generic ethtool_op_get_ts_info callback

[Jeff Kirsher]

From: Jacob Keller <jacob.e.keller@intel.com>

This generic callback is for drivers which have software Tx timestamp
support enabled. Without this, PTP applications requesting software
timestamps may complain that the requested mode is not supported.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
index adb7cb4..5241e08 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
@@ -1182,6 +1182,7 @@ static const struct ethtool_ops fm10k_ethtool_ops = {
 	.set_rxfh		= fm10k_set_rssh,
 	.get_channels		= fm10k_get_channels,
 	.set_channels		= fm10k_set_channels,
+	.get_ts_info		= ethtool_op_get_ts_info,
 };
 
 void fm10k_set_ethtool_ops(struct net_device *dev)
-- 
2.7.4

[net-next 2/2] fm10k: wrap long line for alloc_workqueue

[Jeff Kirsher]

From: Jacob Keller <jacob.e.keller@intel.com>

Trivial change here to cleanup a checkpatch.pl warning that got
introduced when changing to alloc_workqueue.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/fm10k/fm10k_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
index 0d39103..5de9378 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
@@ -56,7 +56,8 @@ static int __init fm10k_init_module(void)
 	pr_info("%s\n", fm10k_copyright);
 
 	/* create driver workqueue */
-	fm10k_workqueue = alloc_workqueue("%s", WQ_MEM_RECLAIM, 0, fm10k_driver_name);
+	fm10k_workqueue = alloc_workqueue("%s", WQ_MEM_RECLAIM, 0,
+					  fm10k_driver_name);
 
 	fm10k_dbg_init();
 
-- 
2.7.4

Re: [net-next 0/2][pull request] 100GbE Intel Wired LAN Driver Updates 2016-10-02

[David Miller]

From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Sun,  2 Oct 2016 23:40:41 -0700

> This series contains updates to fm10k only.
> 
> Jake fixes an issue where PTP applications requesting software timestamps
> may complain that the requested mode is not supported, so add a generic
> callback for those drivers that have software transmit timestamp support
> enabled.  Then provides a trivial cleanup where a code was not wrapped
> properly.  Got make sure that code looks good in a 80 character limit.
> 
> The following are changes since commit 7c70c4f8b2bf5ed777120f3d70efe35e64930c10:
>   cxgb4: unexport cxgb4_dcb_enabled
> and are available in the git repository at:
>   git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 100GbE

Pulled.