diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-21 22:28:24 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-21 22:28:24 -0500 |
| commit | 1459143386c5d868c87903b8d433a52cffcf3e66 (patch) | |
| tree | e7878a550aaf6a3af5e84f4258bbcc3bbdd20fef /drivers/net/vxlan.c | |
| parent | 53b15ef3c2a6bac8e3d9bb58c5689d731ed9593b (diff) | |
| parent | 8a84e01e147f44111988f9d8ccd2eaa30215a0f2 (diff) | |
| download | talos-obmc-linux-1459143386c5d868c87903b8d433a52cffcf3e66.tar.gz talos-obmc-linux-1459143386c5d868c87903b8d433a52cffcf3e66.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ieee802154/fakehard.c
A bug fix went into 'net' for ieee802154/fakehard.c, which is removed
in 'net-next'.
Add build fix into the merge from Stephen Rothwell in openvswitch, the
logging macros take a new initial 'log' argument, a new call was added
in 'net' so when we merge that in here we have to explicitly add the
new 'log' arg to it else the build fails.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vxlan.c')
| -rw-r--r-- | drivers/net/vxlan.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 64d45fa3d997..e9f81d463659 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -67,12 +67,6 @@ #define VXLAN_FLAGS 0x08000000 /* struct vxlanhdr.vx_flags required value. */ -/* VXLAN protocol header */ -struct vxlanhdr { - __be32 vx_flags; - __be32 vx_vni; -}; - /* UDP port for VXLAN traffic. * The IANA assigned port is 4789, but the Linux default is 8472 * for compatibility with early adopters. |
