diff options
| author | David S. Miller <davem@davemloft.net> | 2018-02-28 20:34:20 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-02-28 20:34:20 +0300 |
| commit | a6a8f0196d85ef81e44ceace6803b0195d122e17 (patch) | |
| tree | 644bd64487c6b85eb2c9a967f6e7996fef6d9a22 /drivers/net/ethernet/intel/fm10k/fm10k_pf.c | |
| parent | 540749293a5f6bd804c0a35eb8d0f71dc3b39fc4 (diff) | |
| parent | e9d328d3b753d6f9c75653107fc0689a8e681b16 (diff) | |
| download | linux-a6a8f0196d85ef81e44ceace6803b0195d122e17.tar.xz | |
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 2018-02-28
This series contains updates to fm10k only.
Jake provides all the changes in this series, starting with making the
function header comments consistent and to align with how the kernel
documentation expects it. Also cleaned up code comment as well as bump
the driver version.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/fm10k/fm10k_pf.c')
| -rw-r--r-- | drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c index d6406fc31ffb..bee192fe2ffb 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c @@ -1,5 +1,5 @@ /* Intel(R) Ethernet Switch Host Interface Driver - * Copyright(c) 2013 - 2017 Intel Corporation. + * Copyright(c) 2013 - 2018 Intel Corporation. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -1180,7 +1180,7 @@ s32 fm10k_iov_msg_msix_pf(struct fm10k_hw *hw, u32 **results, /** * fm10k_iov_select_vid - Select correct default VLAN ID - * @hw: Pointer to hardware structure + * @vf_info: pointer to VF information structure * @vid: VLAN ID to correct * * Will report an error if the VLAN ID is out of range. For VID = 0, it will |