this patch fixes the build of i40e on a 3.19 kernel.

Having seen http://sourceforge.net/p/e1000/patches/31/ I guess you
already have fixed this as well. Nonetheless this might help others as
long as the code isn't public.

---
 src/i40e/i40e_main.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i40e/i40e_main.c b/src/i40e/i40e_main.c
index 5e503e0..f7f82c9 100644
--- a/src/i40e/i40e_main.c
+++ b/src/i40e/i40e_main.c
@@ -8282,7 +8282,7 @@ static void i40e_del_vxlan_port(struct net_device
*netdev,
 #endif /* HAVE_VXLAN_RX_OFFLOAD */
 #ifdef HAVE_NDO_GET_PHYS_PORT_ID
 static int i40e_get_phys_port_id(struct net_device *netdev,
-                                struct netdev_phys_port_id *ppid)
+                                struct netdev_phys_item_id *ppid)
 {
        struct i40e_netdev_priv *np = netdev_priv(netdev);
        struct i40e_pf *pf = np->vsi->back;
@@ -8496,7 +8496,12 @@ static int i40e_ndo_bridge_getlink(struct sk_buff
*skb, u32 pid, u32 seq,
        if (!veb)
                return 0;
 
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) )
        return ndo_dflt_bridge_getlink(skb, pid, seq, dev, veb->bridge_mode);
+#else
+       return ndo_dflt_bridge_getlink(skb, pid, seq, dev, veb->bridge_mode,
0, 0);
+#endif
+
 }
 #endif /* HAVE_BRIDGE_ATTRIBS */
 #endif /* HAVE_FDB_OPS */
-- 
2.1.0


------------------------------------------------------------------------------
BPM Camp - Free Virtual Workshop May 6th at 10am PDT/1PM EDT
Develop your own process in accordance with the BPMN 2 standard
Learn Process modeling best practices with Bonita BPM through live exercises
http://www.bonitasoft.com/be-part-of-it/events/bpm-camp-virtual- event?utm_
source=Sourceforge_BPM_Camp_5_6_15&utm_medium=email&utm_campaign=VA_SF
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel&#174; Ethernet, visit 
http://communities.intel.com/community/wired

Reply via email to