projects / packages / ixgbe.git / blame
| Commit | Line | Data |
|---|---|---|
| 2e39cca3 JR |
1 | --- ixgbe-3.23.2.1/src/ixgbe_main.c.orig 2015-03-30 20:07:50.662015699 +0200 |
| 2 | +++ ixgbe-3.23.2.1/src/ixgbe_main.c 2015-03-30 20:12:33.988694214 +0200 | |
| 3 | @@ -8874,10 +8874,17 @@ | |
| 4 | ||
| 5 | #ifdef HAVE_FDB_OPS | |
| 6 | #ifdef USE_CONST_DEV_UC_CHAR | |
| 7 | +#ifdef USE_NDO_DFLT_FDB_VID | |
| 8 | +static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], | |
| 9 | + struct net_device *dev, | |
| 10 | + const unsigned char *addr, | |
| 11 | + u16 flags, u16 vid) | |
| 12 | +#else | |
| 13 | static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], | |
| 14 | struct net_device *dev, | |
| 15 | const unsigned char *addr, | |
| 16 | u16 flags) | |
| 17 | +#endif | |
| 18 | #else | |
| 19 | static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, | |
| 20 | struct net_device *dev, | |
| 21 | @@ -8892,7 +8899,11 @@ | |
| 22 | } | |
| 23 | ||
| 24 | #ifdef USE_CONST_DEV_UC_CHAR | |
| 25 | +#ifdef USE_NDO_DFLT_FDB_VID | |
| 26 | + return ndo_dflt_fdb_add(ndm, tb, dev, addr, flags, vid); | |
| 27 | +#else | |
| 28 | return ndo_dflt_fdb_add(ndm, tb, dev, addr, flags); | |
| 29 | +#endif | |
| 30 | #else | |
| 31 | return ndo_dflt_fdb_add(ndm, dev, addr, flags); | |
| 32 | #endif | |
| 33 | @@ -8955,7 +8966,11 @@ | |
| 34 | ||
| 35 | mode = adapter->bridge_mode; | |
| 36 | ||
| 37 | +#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) ) | |
| 38 | + return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, 0, 0); | |
| 39 | +#else | |
| 40 | return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode); | |
| 41 | +#endif | |
| 42 | } | |
| 43 | #endif /* HAVE_BRIDGE_ATTRIBS */ | |
| 44 | #endif /* HAVE_FDB_OPS */ | |
| 45 | --- ixgbe-3.23.2.1/src/kcompat.h~ 2015-02-18 23:06:34.000000000 +0100 | |
| 46 | +++ ixgbe-3.23.2.1/src/kcompat.h 2015-03-30 20:07:25.142014632 +0200 | |
| 47 | @@ -3935,6 +3935,10 @@ | |
| 48 | #define USE_CONST_DEV_UC_CHAR | |
| 49 | #endif /* >= 3.7.0 */ | |
| 50 | ||
| 51 | +#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) ) | |
| 52 | +#define USE_NDO_DFLT_FDB_VID | |
| 53 | +#endif | |
| 54 | + | |
| 55 | /*****************************************************************************/ | |
| 56 | #if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) ) | |
| 57 | #ifndef pci_sriov_set_totalvfs |