Merge tag '4.3-rc-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6

[linux.git] / include / net / vxlan.h

diff --git a/include/net/vxlan.h b/include/net/vxlan.h
index 00254a58824bd0abcae412388db307bbe8c5e8d5..dc1583a1fb8a6c2172e02e850e39fdd8565caed4 100644 (file)
--- a/include/net/vxlan.h
+++ b/include/net/vxlan.h
@@ -8,6 +8,8 @@
 #include <net/rtnetlink.h>
 #include <net/switchdev.h>
 
+#define IANA_VXLAN_UDP_PORT     4789
+
 /* VXLAN protocol (RFC 7348) header:
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  * |R|R|R|R|I|R|R|R|               Reserved                        |
@@ -240,7 +242,7 @@ struct vxlan_dev {
        struct vxlan_rdst default_dst;  /* default destination */
 
        struct timer_list age_timer;
-       spinlock_t        hash_lock;
+       spinlock_t        hash_lock[FDB_HASH_SIZE];
        unsigned int      addrcnt;
        struct gro_cells  gro_cells;