diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-09-04 21:18:58 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-09-04 21:18:57 -0700 |
| commit | 93e700b2d29d4ef9f35bb9fd20cb872147b2570d (patch) | |
| tree | 773c292808371d95b3f3652842a2e2414235525d | |
| parent | c1291c57d1f131e6cdde86bd7f27052b90f39d84 (diff) | |
| parent | 941d2a76bfeb20b519656c35b809f5c1877b85a4 (diff) | |
Merge "net: Include additional rmnet header in flow_dissector"
| -rw-r--r-- | drivers/char/diag/diagfwd_bridge.c | 2 | ||||
| -rw-r--r-- | net/core/flow_dissector.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/diag/diagfwd_bridge.c b/drivers/char/diag/diagfwd_bridge.c index ad6203fe5684..da24a11903d5 100644 --- a/drivers/char/diag/diagfwd_bridge.c +++ b/drivers/char/diag/diagfwd_bridge.c @@ -23,7 +23,9 @@ #ifdef CONFIG_USB_QCOM_DIAG_BRIDGE #include "diagfwd_hsic.h" #endif +#ifdef CONFIG_MSM_MHI #include "diagfwd_mhi.h" +#endif #include "diag_dci.h" #ifndef CONFIG_USB_QCOM_DIAG_BRIDGE diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 875555959ed0..1e03956b7bb7 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -6,6 +6,7 @@ #include <linux/if_vlan.h> #include <net/ip.h> #include <net/ipv6.h> +#include <net/rmnet_config.h> #include <linux/igmp.h> #include <linux/icmp.h> #include <linux/sctp.h> |