diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-10-25 13:30:25 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-10-25 13:30:25 -0700 |
| commit | 0fd6f3e2ecac1dd932fdda74b1bbe8cb6cad52b4 (patch) | |
| tree | f80ba51987ad805119307911213c13dcc55cc5ce /include/linux | |
| parent | a36b6328efdd11fb4002ea0427c95e3cf0e4fd20 (diff) | |
| parent | 392854fb08079416d260c2c5ba6369391eda11d3 (diff) | |
Merge "Merge android-4.4.162 (3eb8e73) into msm-4.4"
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 c77de3b5f564..43c998c83207 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; |