Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93e700b2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: Include additional rmnet header in flow_dissector"

parents c1291c57 941d2a76

drivers/char/diag/diagfwd_bridge.c

+2 −0
Original line number Diff line number Diff line
@@ -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

net/core/flow_dissector.c

+1 −0
Original line number Diff line number Diff line
@@ -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>