diff options
| author | Mark Brown <broonie@kernel.org> | 2018-11-05 10:13:20 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-11-05 10:13:20 +0000 |
| commit | 2d0e730e7977460655df8aeb0ffde2e9a143f82a (patch) | |
| tree | 5b5fb55a9bed5c4d346c6e2b439946e0aa218337 /include/linux | |
| parent | ebbfef1f746893c84d2d5991ee816ac181d211c8 (diff) | |
| parent | 24c2342b8e51ab3185e68470709904150a1e3ee0 (diff) | |
Merge tag 'v4.4.162' into linux-linaro-lsk-v4.4
This is the 4.4.162 stable release
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/hyperv.h | 1 | ||||
| -rw-r--r-- | include/linux/netdevice.h | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index ae6a711dcd1d..281bb007f725 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -1179,6 +1179,7 @@ int vmbus_allocate_mmio(struct resource **new, struct hv_device *device_obj, struct hv_util_service { u8 *recv_buffer; + void *channel; void (*util_cb)(void *); int (*util_init)(struct hv_util_service *); void (*util_deinit)(void); diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index fc54049e8286..0b211d482c96 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2168,6 +2168,13 @@ struct netdev_notifier_info { struct net_device *dev; }; +struct netdev_notifier_info_ext { + struct netdev_notifier_info info; /* must be first */ + union { + u32 mtu; + } ext; +}; + struct netdev_notifier_change_info { struct netdev_notifier_info info; /* must be first */ unsigned int flags_changed; |