--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -1544,6 +1544,7 @@ enum netdev_priv_flags {
+@@ -1540,6 +1540,7 @@ enum netdev_priv_flags {
IFF_FAILOVER_SLAVE = 1<<28,
IFF_L3MDEV_RX_HANDLER = 1<<29,
IFF_LIVE_RENAME_OK = 1<<30,
};
#define IFF_802_1Q_VLAN IFF_802_1Q_VLAN
-@@ -1576,6 +1577,7 @@ enum netdev_priv_flags {
+@@ -1572,6 +1573,7 @@ enum netdev_priv_flags {
#define IFF_FAILOVER_SLAVE IFF_FAILOVER_SLAVE
#define IFF_L3MDEV_RX_HANDLER IFF_L3MDEV_RX_HANDLER
#define IFF_LIVE_RENAME_OK IFF_LIVE_RENAME_OK
+#define IFF_NO_IP_ALIGN IFF_NO_IP_ALIGN
- /**
- * struct net_device - The DEVICE structure.
-@@ -1877,6 +1879,11 @@ struct net_device {
+ /* Specifies the type of the struct net_device::ml_priv pointer */
+ enum netdev_ml_priv_type {
+@@ -1882,6 +1884,11 @@ struct net_device {
const struct tlsdev_ops *tlsdev_ops;
#endif
const struct header_ops *header_ops;
unsigned int flags;
-@@ -1959,6 +1966,10 @@ struct net_device {
+@@ -1964,6 +1971,10 @@ struct net_device {
struct mpls_dev __rcu *mpls_ptr;
#endif
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -2665,6 +2665,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -2684,6 +2684,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
-@@ -2796,16 +2800,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -2815,16 +2819,6 @@ static inline struct sk_buff *dev_alloc_
}
help
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -3194,10 +3194,20 @@ static int xmit_one(struct sk_buff *skb,
+@@ -3221,10 +3221,20 @@ static int xmit_one(struct sk_buff *skb,
if (dev_nit_active(dev))
dev_queue_xmit_nit(skb, dev);
#include <net/protocol.h>
#include <net/dst.h>
-@@ -540,6 +541,22 @@ skb_fail:
+@@ -549,6 +550,22 @@ skb_fail:
}
EXPORT_SYMBOL(__napi_alloc_skb);