projects / packages / ixgbe.git / blame
| Commit | Line | Data |
|---|---|---|
| 9127317a JR |
1 | --- ixgbe-4.1.1/src/ixgbe_main.c~ 2015-04-30 02:13:22.000000000 +0200 |
| 2 | +++ ixgbe-4.1.1/src/ixgbe_main.c 2015-07-04 14:40:47.319817216 +0200 | |
| 3 | @@ -9447,7 +9447,11 @@ | |
| 4 | return 0; | |
| 5 | } | |
| 6 | ||
| 7 | -#ifdef HAVE_BRIDGE_FILTER | |
| 8 | +#ifdef HAVE_NDO_BRIDGE_GETLINK_NLFLAGS | |
| 9 | +static int ixgbe_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq, | |
| 10 | + struct net_device *dev, u32 filter_mask, | |
| 11 | + int nlflags) | |
| 12 | +#elif defined(HAVE_BRIDGE_FILTER) | |
| 13 | static int ixgbe_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq, | |
| 14 | struct net_device *dev, | |
| 15 | u32 __always_unused filter_mask) | |
| 16 | @@ -9464,7 +9464,9 @@ | |
| 17 | ||
| 18 | mode = adapter->bridge_mode; | |
| 19 | ||
| 20 | -#ifdef HAVE_NDO_FDB_ADD_VID | |
| 21 | +#ifdef HAVE_NDO_BRIDGE_GETLINK_NLFLAGS | |
| 22 | + return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, 0, 0, nlflags); | |
| 23 | +#elif defined(HAVE_NDO_FDB_ADD_VID) | |
| 24 | return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, 0, 0); | |
| 25 | #else | |
| 26 | return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode); | |
| 27 | --- ixgbe-4.1.1/src/kcompat.h~ 2015-04-30 02:13:22.000000000 +0200 | |
| 28 | +++ ixgbe-4.1.1/src/kcompat.h 2015-07-04 14:44:02.702152426 +0200 | |
| 29 | @@ -4539,6 +4539,7 @@ | |
| 30 | #endif | |
| 31 | #else | |
| 32 | #define HAVE_PTP_CLOCK_INFO_GETTIME64 | |
| 33 | +#define HAVE_NDO_BRIDGE_GETLINK_NLFLAGS | |
| 34 | #endif /* 4,1,0 */ | |
| 35 | ||
| 36 | #endif /* _KCOMPAT_H_ */ |