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

Commit 3b9e9488 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2016-01-25

This series contains updates to i40e only and so I won't continue receiving
patches to fix the same issue (again).

Arnd fixes the driver from causing the compiler whining about uninitialized
variables, so initialize those variables.

Eric fixes the build errors/warnings which were introduced by Anjali
when she added geneve support to i40e.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c85e4924 79febbc1

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

+5 −10
Original line number Diff line number Diff line
@@ -7117,9 +7117,7 @@ static void i40e_service_task(struct work_struct *work) 
	i40e_watchdog_subtask(pf);

	i40e_fdir_reinit_subtask(pf);

	i40e_sync_filters_subtask(pf);

#if IS_ENABLED(CONFIG_VXLAN) || IS_ENABLED(CONFIG_GENEVE)

	i40e_sync_udp_filters_subtask(pf);

#endif

	i40e_clean_adminq_subtask(pf);



	i40e_service_event_complete(pf);
@@ -8515,6 +8513,8 @@ static u8 i40e_get_udp_port_idx(struct i40e_pf *pf, __be16 port) 
}



#endif



#if IS_ENABLED(CONFIG_VXLAN)

/**

 * i40e_add_vxlan_port - Get notifications about VXLAN ports that come up

 * @netdev: This physical port's netdev
@@ -8524,7 +8524,6 @@ static u8 i40e_get_udp_port_idx(struct i40e_pf *pf, __be16 port) 
static void i40e_add_vxlan_port(struct net_device *netdev,

				sa_family_t sa_family, __be16 port)

{

#if IS_ENABLED(CONFIG_VXLAN)

	struct i40e_netdev_priv *np = netdev_priv(netdev);

	struct i40e_vsi *vsi = np->vsi;

	struct i40e_pf *pf = vsi->back;
@@ -8557,7 +8556,6 @@ static void i40e_add_vxlan_port(struct net_device *netdev, 
	pf->udp_ports[next_idx].type = I40E_AQC_TUNNEL_TYPE_VXLAN;

	pf->pending_udp_bitmap |= BIT_ULL(next_idx);

	pf->flags |= I40E_FLAG_UDP_FILTER_SYNC;

#endif

}



/**
@@ -8569,7 +8567,6 @@ static void i40e_add_vxlan_port(struct net_device *netdev, 
static void i40e_del_vxlan_port(struct net_device *netdev,

				sa_family_t sa_family, __be16 port)

{

#if IS_ENABLED(CONFIG_VXLAN)

	struct i40e_netdev_priv *np = netdev_priv(netdev);

	struct i40e_vsi *vsi = np->vsi;

	struct i40e_pf *pf = vsi->back;
@@ -8592,9 +8589,10 @@ static void i40e_del_vxlan_port(struct net_device *netdev, 
		netdev_warn(netdev, "vxlan port %d was not found, not deleting\n",

			    ntohs(port));

	}

#endif

}

#endif



#if IS_ENABLED(CONFIG_GENEVE)

/**

 * i40e_add_geneve_port - Get notifications about GENEVE ports that come up

 * @netdev: This physical port's netdev
@@ -8604,7 +8602,6 @@ static void i40e_del_vxlan_port(struct net_device *netdev, 
static void i40e_add_geneve_port(struct net_device *netdev,

				 sa_family_t sa_family, __be16 port)

{

#if IS_ENABLED(CONFIG_GENEVE)

	struct i40e_netdev_priv *np = netdev_priv(netdev);

	struct i40e_vsi *vsi = np->vsi;

	struct i40e_pf *pf = vsi->back;
@@ -8639,7 +8636,6 @@ static void i40e_add_geneve_port(struct net_device *netdev, 
	pf->flags |= I40E_FLAG_UDP_FILTER_SYNC;



	dev_info(&pf->pdev->dev, "adding geneve port %d\n", ntohs(port));

#endif

}



/**
@@ -8651,7 +8647,6 @@ static void i40e_add_geneve_port(struct net_device *netdev, 
static void i40e_del_geneve_port(struct net_device *netdev,

				 sa_family_t sa_family, __be16 port)

{

#if IS_ENABLED(CONFIG_GENEVE)

	struct i40e_netdev_priv *np = netdev_priv(netdev);

	struct i40e_vsi *vsi = np->vsi;

	struct i40e_pf *pf = vsi->back;
@@ -8677,8 +8672,8 @@ static void i40e_del_geneve_port(struct net_device *netdev, 
		netdev_warn(netdev, "geneve port %d was not found, not deleting\n",

			    ntohs(port));

	}

#endif

}

#endif



static int i40e_get_phys_port_id(struct net_device *netdev,

				 struct netdev_phys_item_id *ppid)

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

+2 −2
Original line number Diff line number Diff line
@@ -2313,8 +2313,8 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags, 
	struct iphdr *this_ip_hdr;

	u32 network_hdr_len;

	u8 l4_hdr = 0;

	struct udphdr *oudph;

	struct iphdr *oiph;

	struct udphdr *oudph = NULL;

	struct iphdr *oiph = NULL;

	u32 l4_tunnel = 0;



	if (skb->encapsulation) {