diff options
| author |   Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2019-07-04 10:40:06 +0200 |
|---|---|---|
| committer | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2019-07-04 10:48:05 +0200 |
| commit | 8d53e9f3c6001dcb2865f6e894da5b54e1418f88 (patch) | |
| tree | 63907f21c13636a987d43463c675d0727a04e327 /kernel/linux/kni | |
| parent | e2bea7436061ca2e7e14bfcfdc5870f2555c3965 (diff) | |
New upstream version 18.11.2upstream-18.11-stable
Change-Id: I23eb4f9179abf1f9c659891f8fddb27ee68ad26b
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Diffstat (limited to 'kernel/linux/kni')
| -rw-r--r-- | kernel/linux/kni/ethtool/igb/igb_main.c | 6 | ||||
| -rw-r--r-- | kernel/linux/kni/ethtool/igb/kcompat.h | 4 | ||||
| -rw-r--r-- | kernel/linux/kni/kni_misc.c | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/kernel/linux/kni/ethtool/igb/igb_main.c b/kernel/linux/kni/ethtool/igb/igb_main.c index 0b4faeae..cda2b063 100644 --- a/kernel/linux/kni/ethtool/igb/igb_main.c +++ b/kernel/linux/kni/ethtool/igb/igb_main.c @@ -2112,7 +2112,13 @@ static int igb_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], #ifdef HAVE_NDO_FDB_ADD_VID u16 vid, #endif +#ifdef HAVE_NDO_FDB_ADD_EXTACK + u16 flags, + struct netlink_ext_ack *extack) +#else u16 flags) +#endif + #else static int igb_ndo_fdb_add(struct ndmsg *ndm, struct net_device *dev, diff --git a/kernel/linux/kni/ethtool/igb/kcompat.h b/kernel/linux/kni/ethtool/igb/kcompat.h index 11b15f3a..649a69c8 100644 --- a/kernel/linux/kni/ethtool/igb/kcompat.h +++ b/kernel/linux/kni/ethtool/igb/kcompat.h @@ -3945,6 +3945,10 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type) #define HAVE_NDO_BRIDGE_SETLINK_EXTACK #endif /* >= 5.0.0 */ +#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0) ) +#define HAVE_NDO_FDB_ADD_EXTACK +#endif /* >= 5.1.0 */ + #if defined(timer_setup) && defined(from_timer) #define HAVE_TIMER_SETUP #endif diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c index 522ae23b..b74e8a3a 100644 --- a/kernel/linux/kni/kni_misc.c +++ b/kernel/linux/kni/kni_misc.c @@ -447,7 +447,7 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num, ether_addr_copy(net_dev->dev_addr, kni->lad_dev->dev_addr); else { /* if user has provided a valid mac address */ - if (is_valid_ether_addr((unsigned char *)(dev_info.mac_addr))) + if (is_valid_ether_addr(dev_info.mac_addr)) memcpy(net_dev->dev_addr, dev_info.mac_addr, ETH_ALEN); else /* |