projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'arc-v3.13-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
net
/
openvswitch
/
vport-gre.c
diff --git
a/net/openvswitch/vport-gre.c
b/net/openvswitch/vport-gre.c
index c99dea543d648dbd377c7168cad517c8bc76bf76..a3d6951602db59c58e6086862d8db2f3a0cd306d 100644
(file)
--- a/
net/openvswitch/vport-gre.c
+++ b/
net/openvswitch/vport-gre.c
@@
-24,8
+24,6
@@
#include <linux/if_tunnel.h>
#include <linux/if_vlan.h>
#include <linux/in.h>
#include <linux/if_tunnel.h>
#include <linux/if_vlan.h>
#include <linux/in.h>
-#include <linux/if_vlan.h>
-#include <linux/in.h>
#include <linux/in_route.h>
#include <linux/inetdevice.h>
#include <linux/jhash.h>
#include <linux/in_route.h>
#include <linux/inetdevice.h>
#include <linux/jhash.h>