1 --- a/include/linux/netdevice.h
2 +++ b/include/linux/netdevice.h
3 @@ -1227,6 +1227,11 @@ struct net_device {
4 const struct ethtool_ops *ethtool_ops;
5 const struct forwarding_accel_ops *fwd_ops;
7 +#ifdef CONFIG_ETHERNET_PACKET_MANGLE
8 + void (*eth_mangle_rx)(struct net_device *dev, struct sk_buff *skb);
9 + struct sk_buff *(*eth_mangle_tx)(struct net_device *dev, struct sk_buff *skb);
12 /* Hardware header description */
13 const struct header_ops *header_ops;
15 @@ -1292,6 +1297,9 @@ struct net_device {
16 void *ax25_ptr; /* AX.25 specific data */
17 struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
18 assign before registering */
19 +#ifdef CONFIG_ETHERNET_PACKET_MANGLE
20 + void *phy_ptr; /* PHY device specific data */
24 * Cache lines mostly used on receive path (including eth_type_trans())
25 --- a/include/uapi/linux/if.h
26 +++ b/include/uapi/linux/if.h
28 #define IFF_LIVE_ADDR_CHANGE 0x100000 /* device supports hardware address
29 * change when it's running */
30 #define IFF_MACVLAN 0x200000 /* Macvlan device */
31 +#define IFF_NO_IP_ALIGN 0x200000 /* do not ip-align allocated rx pkts */
34 #define IF_GET_IFACE 0x0001 /* for querying only */
35 --- a/include/linux/skbuff.h
36 +++ b/include/linux/skbuff.h
37 @@ -1776,6 +1776,10 @@ static inline int pskb_trim(struct sk_bu
38 return (len < skb->len) ? __pskb_trim(skb, len) : 0;
41 +extern struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
42 + unsigned int length, gfp_t gfp);
46 * pskb_trim_unique - remove end from a paged unique (not cloned) buffer
47 * @skb: buffer to alter
48 @@ -1902,16 +1906,6 @@ static inline struct sk_buff *dev_alloc_
52 -static inline struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
53 - unsigned int length, gfp_t gfp)
55 - struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
57 - if (NET_IP_ALIGN && skb)
58 - skb_reserve(skb, NET_IP_ALIGN);
62 static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
67 @@ -24,6 +24,12 @@ menuconfig NET
71 +config ETHERNET_PACKET_MANGLE
74 + This option can be selected by phy drivers that need to mangle
75 + packets going in or out of an ethernet device.
77 config WANT_COMPAT_NETLINK_MESSAGES
82 @@ -2604,10 +2604,20 @@ int dev_hard_start_xmit(struct sk_buff *
83 if (!list_empty(&ptype_all))
84 dev_queue_xmit_nit(skb, dev);
87 - rc = ops->ndo_start_xmit(skb, dev);
88 +#ifdef CONFIG_ETHERNET_PACKET_MANGLE
89 + if (!dev->eth_mangle_tx ||
90 + (skb = dev->eth_mangle_tx(dev, skb)) != NULL)
96 + rc = ops->ndo_start_xmit(skb, dev);
98 - trace_net_dev_xmit(skb, rc, dev, skb_len);
99 + trace_net_dev_xmit(skb, rc, dev, skb_len);
103 if (rc == NETDEV_TX_OK)
104 txq_trans_update(txq);
106 --- a/net/core/skbuff.c
107 +++ b/net/core/skbuff.c
109 #include <linux/scatterlist.h>
110 #include <linux/errqueue.h>
111 #include <linux/prefetch.h>
112 +#include <linux/if.h>
114 #include <net/protocol.h>
116 @@ -466,6 +467,22 @@ struct sk_buff *__netdev_alloc_skb(struc
118 EXPORT_SYMBOL(__netdev_alloc_skb);
120 +struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
121 + unsigned int length, gfp_t gfp)
123 + struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
125 +#ifdef CONFIG_ETHERNET_PACKET_MANGLE
126 + if (dev && (dev->priv_flags & IFF_NO_IP_ALIGN))
130 + if (NET_IP_ALIGN && skb)
131 + skb_reserve(skb, NET_IP_ALIGN);
134 +EXPORT_SYMBOL(__netdev_alloc_skb_ip_align);
136 void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off,
137 int size, unsigned int truesize)
139 --- a/net/ethernet/eth.c
140 +++ b/net/ethernet/eth.c
141 @@ -159,6 +159,12 @@ __be16 eth_type_trans(struct sk_buff *sk
146 +#ifdef CONFIG_ETHERNET_PACKET_MANGLE
147 + if (dev->eth_mangle_rx)
148 + dev->eth_mangle_rx(dev, skb);
151 skb_reset_mac_header(skb);
152 skb_pull_inline(skb, ETH_HLEN);