Commit 55426f47 authored by David S. Miller's avatar David S. Miller
Browse files

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



Jeff Kirsher says:

====================
10GbE Intel Wired LAN Driver Updates 2019-06-05

This series contains updates to mainly ixgbe, with a few updates to
i40e, net, ice and hns2 driver.

Jan adds support for tracking each queue pair for whether or not AF_XDP
zero copy is enabled.  Also updated the ixgbe driver to use the
netdev-provided umems so that we do not need to contain these structures
in our own adapter structure.

William Tu provides two fixes for AF_XDP statistics which were causing
incorrect counts.

Jake reduces the PTP transmit timestamp timeout from 15 seconds to 1 second,
which is still well after the maximum expected delay.  Also fixes an
issues with the PTP SDP pin setup which was not properly aligning on a
full second, so updated the code to account for the cyclecounter
multiplier and simplify the code to make the intent of the calculations
more clear.  Updated the function header comments to help with the code
documentation.  Added support for SDP/PPS output for x550 devices, which
is slightly different than x540 devices that currently have this
support.

Anirudh adds a new define for Link Layer Discovery Protocol to the
networking core, so that drivers do not have to create and use their own
definitions.  In addition, update all the drivers currently defining
their own LLDP define to use the new networking core define.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 11694b03 20d437ee

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h

+0 −1
Original line number Diff line number Diff line
@@ -677,7 +677,6 @@ struct hclge_umv_spc_alc_cmd { 
#define HCLGE_MAC_MGR_MASK_VLAN_B		BIT(0)

#define HCLGE_MAC_MGR_MASK_MAC_B		BIT(1)

#define HCLGE_MAC_MGR_MASK_ETHERTYPE_B		BIT(2)

#define HCLGE_MAC_ETHERTYPE_LLDP		0x88cc



struct hclge_mac_mgr_tbl_entry_cmd {

	u8      flags;

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static const struct hclge_comm_stats_str g_mac_stats_string[] = { 
static const struct hclge_mac_mgr_tbl_entry_cmd hclge_mgr_table[] = {

	{

		.flags = HCLGE_MAC_MGR_MASK_VLAN_B,

		.ethter_type = cpu_to_le16(HCLGE_MAC_ETHERTYPE_LLDP),

		.ethter_type = cpu_to_le16(ETH_P_LLDP),

		.mac_addr_hi32 = cpu_to_le32(htonl(0x0180C200)),

		.mac_addr_lo16 = cpu_to_le16(htons(0x000E)),

		.i_port_bitmap = 0x1,

drivers/net/ethernet/intel/i40e/i40e.h

+0 −2
Original line number Diff line number Diff line
@@ -295,8 +295,6 @@ struct i40e_cloud_filter { 
	u8 tunnel_type;

};



#define I40E_ETH_P_LLDP			0x88cc



#define I40E_DCB_PRIO_TYPE_STRICT	0

#define I40E_DCB_PRIO_TYPE_ETS		1

#define I40E_DCB_STRICT_PRIO_CREDITS	127

drivers/net/ethernet/intel/i40e/i40e_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -1330,7 +1330,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp, 
			}

			ret = i40e_aq_add_rem_control_packet_filter(&pf->hw,

						pf->hw.mac.addr,

						I40E_ETH_P_LLDP, 0,

						ETH_P_LLDP, 0,

						pf->vsi[pf->lan_vsi]->seid,

						0, true, NULL, NULL);

			if (ret) {
@@ -1348,7 +1348,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp, 


			ret = i40e_aq_add_rem_control_packet_filter(&pf->hw,

						pf->hw.mac.addr,

						I40E_ETH_P_LLDP, 0,

						ETH_P_LLDP, 0,

						pf->vsi[pf->lan_vsi]->seid,

						0, false, NULL, NULL);

			if (ret) {

drivers/net/ethernet/intel/ice/ice_lib.c

+1 −3
Original line number Diff line number Diff line
@@ -2345,8 +2345,6 @@ ice_vsi_add_rem_eth_mac(struct ice_vsi *vsi, bool add_rule) 
	ice_free_fltr_list(&pf->pdev->dev, &tmp_add_list);

}



#define ICE_ETH_P_LLDP	0x88CC



/**

 * ice_cfg_sw_lldp - Config switch rules for LLDP packet handling

 * @vsi: the VSI being configured
@@ -2366,7 +2364,7 @@ void ice_cfg_sw_lldp(struct ice_vsi *vsi, bool tx, bool create) 


	list->fltr_info.lkup_type = ICE_SW_LKUP_ETHERTYPE;

	list->fltr_info.vsi_handle = vsi->idx;

	list->fltr_info.l_data.ethertype_mac.ethertype = ICE_ETH_P_LLDP;

	list->fltr_info.l_data.ethertype_mac.ethertype = ETH_P_LLDP;



	if (tx) {

		list->fltr_info.fltr_act = ICE_DROP_PACKET;

CRA Git | Maintained and supported by SUSTech CRA and CCSE