Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Several cases of bug fixes in 'net' overlapping other changes in 'net-next-. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -47,8 +47,7 @@ struct inet_skb_parm {
|
||||
#define IPSKB_REROUTED BIT(4)
|
||||
#define IPSKB_DOREDIRECT BIT(5)
|
||||
#define IPSKB_FRAG_PMTU BIT(6)
|
||||
#define IPSKB_FRAG_SEGS BIT(7)
|
||||
#define IPSKB_L3SLAVE BIT(8)
|
||||
#define IPSKB_L3SLAVE BIT(7)
|
||||
|
||||
u16 frag_max_size;
|
||||
};
|
||||
|
Reference in New Issue
Block a user