evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "net: Include additional rmnet header in flow_dissector"

Browse source
This commit is contained in:
Linux Build Service Account 2018-09-04 21:18:58 -07:00 • committed by Gerrit - the friendly Code Review server
commit 93e700b2d2
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/char/diag/diagfwd_bridge.c
View file

@ -23,7 +23,9 @@
#ifdef CONFIG_USB_QCOM_DIAG_BRIDGE #ifdef CONFIG_USB_QCOM_DIAG_BRIDGE
#include "diagfwd_hsic.h" #include "diagfwd_hsic.h"
#endif #endif
#ifdef CONFIG_MSM_MHI
#include "diagfwd_mhi.h" #include "diagfwd_mhi.h"
#endif
#include "diag_dci.h" #include "diag_dci.h"
#ifndef CONFIG_USB_QCOM_DIAG_BRIDGE #ifndef CONFIG_USB_QCOM_DIAG_BRIDGE

1
net/core/flow_dissector.c
View file

@ -6,6 +6,7 @@
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <net/ip.h> #include <net/ip.h>
#include <net/ipv6.h> #include <net/ipv6.h>
#include <net/rmnet_config.h>
#include <linux/igmp.h> #include <linux/igmp.h>
#include <linux/icmp.h> #include <linux/icmp.h>
#include <linux/sctp.h> #include <linux/sctp.h>