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

Commit 0438e3c8 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Jeff Kirsher says:

====================
100GbE Intel Wired LAN Driver Updates 2016-10-02

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.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents edfc23ee 5e3d033e

drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -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)

drivers/net/ethernet/intel/fm10k/fm10k_main.c

+2 −1
Original line number Diff line number Diff line
@@ -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();