Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The MSCC bug fix in 'net' had to be slightly adjusted because the register accesses are done slightly differently in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -81,7 +81,6 @@
|
||||
|
||||
/* MPTCP ADD_ADDR flags */
|
||||
#define MPTCP_ADDR_ECHO BIT(0)
|
||||
#define MPTCP_ADDR_HMAC_LEN 20
|
||||
#define MPTCP_ADDR_IPVERSION_4 4
|
||||
#define MPTCP_ADDR_IPVERSION_6 6
|
||||
|
||||
|
||||
Reference in New Issue
Block a user