3c3
< Copyright (c) 2001-2015, Intel Corporation
---
> Copyright (c) 2001-2017, Intel Corporation
5,6c5,6
<
< Redistribution and use in source and binary forms, with or without
---
>
> Redistribution and use in source and binary forms, with or without
8,9c8,9
<
< 1. Redistributions of source code must retain the above copyright notice,
---
>
> 1. Redistributions of source code must retain the above copyright notice,
11,13c11,13
<
< 2. Redistributions in binary form must reproduce the above copyright
< notice, this list of conditions and the following disclaimer in the
---
>
> 2. Redistributions in binary form must reproduce the above copyright
> notice, this list of conditions and the following disclaimer in the
15,17c15,17
<
< 3. Neither the name of the Intel Corporation nor the names of its
< contributors may be used to endorse or promote products derived from
---
>
> 3. Neither the name of the Intel Corporation nor the names of its
> contributors may be used to endorse or promote products derived from
19c19
<
---
>
21,28c21,28
< AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
< IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
< ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
< LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
< CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
< SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
< INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
< CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
---
> AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
> LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
> CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
> SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
> CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
33c33
< /*$FreeBSD: stable/11/sys/dev/ixgbe/ixgbe_82599.c 292674 2015-12-23 22:45:17Z sbruno $*/
---
> /*$FreeBSD: stable/11/sys/dev/ixgbe/ixgbe_82599.c 320897 2017-07-11 21:25:07Z erj $*/
396a397,400
> mac->ops.bypass_rw = ixgbe_bypass_rw_generic;
> mac->ops.bypass_valid_rd = ixgbe_bypass_valid_rd_generic;
> mac->ops.bypass_set = ixgbe_bypass_set_generic;
> mac->ops.bypass_rd_eep = ixgbe_bypass_rd_eep_generic;
1180,1182d1183
< hw->mac.ops.set_rar(hw, hw->mac.num_rar_entries - 1,
< hw->mac.san_addr, 0, IXGBE_RAH_AV);
<
1185a1187,1193
> hw->mac.ops.set_rar(hw, hw->mac.san_mac_rar_index,
> hw->mac.san_addr, 0, IXGBE_RAH_AV);
>
> /* clear VMDq pool/queue selection for this RAR */
> hw->mac.ops.clear_vmdq(hw, hw->mac.san_mac_rar_index,
> IXGBE_CLEAR_VMDQ_ALL);
>
1384,1386d1391
< if ((hw->mac.type == ixgbe_mac_X550) ||
< (hw->mac.type == ixgbe_mac_X550EM_x))
< fdirctrl |= IXGBE_FDIRCTRL_DROP_NO_MATCH;
1415c1420,1421
< (hw->mac.type == ixgbe_mac_X550EM_x))
---
> (hw->mac.type == ixgbe_mac_X550EM_x) ||
> (hw->mac.type == ixgbe_mac_X550EM_a))
1741c1747
< /* mask VLAN ID, fall through to mask VLAN priority */
---
> /* mask VLAN ID */
1742a1749
> /* fall through */
1748c1755
< /* mask VLAN ID only, fall through */
---
> /* mask VLAN ID only */
1749a1757
> /* fall through */
1760c1768
< /* Mask Flex Bytes, fall through */
---
> /* Mask Flex Bytes */
1761a1770
> /* fall through */
1812,1814c1821,1823
< /* Set all bits in FDIRTCPM, FDIRUDPM, FDIRSIP4M and
< * FDIRDIP4M in cloud mode to allow L3/L3 packets to
< * tunnel.
---
> /* Set all bits in FDIRTCPM, FDIRUDPM, FDIRSCTPM,
> * FDIRSIP4M and FDIRDIP4M in cloud mode to allow
> * L3/L3 packets to tunnel.
1819a1829,1837
> switch (hw->mac.type) {
> case ixgbe_mac_X550:
> case ixgbe_mac_X550EM_x:
> case ixgbe_mac_X550EM_a:
> IXGBE_WRITE_REG(hw, IXGBE_FDIRSCTPM, 0xFFFFFFFF);
> break;
> default:
> break;
> }
1836a1855
> case ixgbe_mac_X550EM_a:
2015a2035
> /* fall through */
2161c2181
< u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw)
---
> u64 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw)
2163c2183
< u32 physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN;
---
> u64 physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN;