--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -1270,6 +1270,7 @@ enum netdev_priv_flags {
+@@ -1271,6 +1271,7 @@ enum netdev_priv_flags {
IFF_XMIT_DST_RELEASE_PERM = 1<<22,
IFF_IPVLAN_MASTER = 1<<23,
IFF_IPVLAN_SLAVE = 1<<24,
};
#define IFF_802_1Q_VLAN IFF_802_1Q_VLAN
-@@ -1297,6 +1298,7 @@ enum netdev_priv_flags {
+@@ -1298,6 +1299,7 @@ enum netdev_priv_flags {
#define IFF_XMIT_DST_RELEASE_PERM IFF_XMIT_DST_RELEASE_PERM
#define IFF_IPVLAN_MASTER IFF_IPVLAN_MASTER
#define IFF_IPVLAN_SLAVE IFF_IPVLAN_SLAVE
/**
* struct net_device - The DEVICE structure.
-@@ -1567,6 +1569,11 @@ struct net_device {
+@@ -1568,6 +1570,11 @@ struct net_device {
const struct swdev_ops *swdev_ops;
#endif
const struct header_ops *header_ops;
unsigned int flags;
-@@ -1633,6 +1640,10 @@ struct net_device {
+@@ -1634,6 +1641,10 @@ struct net_device {
struct mpls_dev __rcu *mpls_ptr;
#endif
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -2058,6 +2058,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -2083,6 +2083,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}
/**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter
-@@ -2184,16 +2188,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -2209,16 +2213,6 @@ static inline struct sk_buff *dev_alloc_
}
help
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -2645,10 +2645,20 @@ static int xmit_one(struct sk_buff *skb,
+@@ -2650,10 +2650,20 @@ static int xmit_one(struct sk_buff *skb,
if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all))
dev_queue_xmit_nit(skb, dev);
#include <net/protocol.h>
#include <net/dst.h>
-@@ -568,6 +569,22 @@ struct sk_buff *__napi_alloc_skb(struct
+@@ -570,6 +571,22 @@ struct sk_buff *__napi_alloc_skb(struct
}
EXPORT_SYMBOL(__napi_alloc_skb);