OpenWrt – Diff between revs 2 and 3
?pathlinks?
Rev 2 | Rev 3 | |||
---|---|---|---|---|
Line 13... | Line 13... | |||
13 | net/ethernet/eth.c | 6 ++++++ |
13 | net/ethernet/eth.c | 6 ++++++ |
|
14 | 6 files changed, 58 insertions(+), 14 deletions(-) |
14 | 6 files changed, 58 insertions(+), 14 deletions(-) |
|
Line 15... | Line 15... | |||
15 | |
15 | |
|
16 | --- a/include/linux/netdevice.h |
16 | --- a/include/linux/netdevice.h |
|
17 | +++ b/include/linux/netdevice.h |
17 | +++ b/include/linux/netdevice.h |
|
- | 18 | @@ -1410,6 +1410,7 @@ enum netdev_priv_flags { |
||
18 | @@ -1412,6 +1412,7 @@ enum netdev_priv_flags { |
19 | IFF_RXFH_CONFIGURED = 1<<25, |
|
19 | IFF_PHONY_HEADROOM = 1<<26, |
20 | IFF_PHONY_HEADROOM = 1<<26, |
|
20 | IFF_MACSEC = 1<<27, |
- | ||
21 | IFF_L3MDEV_RX_HANDLER = 1<<28, |
21 | IFF_MACSEC = 1<<27, |
|
22 | + IFF_NO_IP_ALIGN = 1<<29, |
22 | + IFF_NO_IP_ALIGN = 1<<28, |
|
Line 23... | Line 23... | |||
23 | }; |
23 | }; |
|
24 | |
24 | |
|
- | 25 | #define IFF_802_1Q_VLAN IFF_802_1Q_VLAN |
||
25 | #define IFF_802_1Q_VLAN IFF_802_1Q_VLAN |
26 | @@ -1439,6 +1440,7 @@ enum netdev_priv_flags { |
|
26 | @@ -1442,6 +1443,7 @@ enum netdev_priv_flags { |
27 | #define IFF_TEAM IFF_TEAM |
|
27 | #define IFF_RXFH_CONFIGURED IFF_RXFH_CONFIGURED |
- | ||
28 | #define IFF_MACSEC IFF_MACSEC |
28 | #define IFF_RXFH_CONFIGURED IFF_RXFH_CONFIGURED |
|
Line 29... | Line 29... | |||
29 | #define IFF_L3MDEV_RX_HANDLER IFF_L3MDEV_RX_HANDLER |
29 | #define IFF_MACSEC IFF_MACSEC |
|
30 | +#define IFF_NO_IP_ALIGN IFF_NO_IP_ALIGN |
30 | +#define IFF_NO_IP_ALIGN IFF_NO_IP_ALIGN |
|
31 | |
31 | |
|
32 | /** |
32 | /** |
|
33 | * struct net_device - The DEVICE structure. |
33 | * struct net_device - The DEVICE structure. |
|
Line 34... | Line 34... | |||
34 | @@ -1728,6 +1730,11 @@ struct net_device { |
34 | @@ -1725,6 +1727,11 @@ struct net_device { |
|
35 | const struct xfrmdev_ops *xfrmdev_ops; |
35 | const struct xfrmdev_ops *xfrmdev_ops; |
|
Line 41... | Line 41... | |||
41 | +#endif |
41 | +#endif |
|
42 | + |
42 | + |
|
43 | const struct header_ops *header_ops; |
43 | const struct header_ops *header_ops; |
|
Line 44... | Line 44... | |||
44 | |
44 | |
|
45 | unsigned int flags; |
45 | unsigned int flags; |
|
46 | @@ -1797,6 +1804,10 @@ struct net_device { |
46 | @@ -1794,6 +1801,10 @@ struct net_device { |
|
47 | struct mpls_dev __rcu *mpls_ptr; |
47 | struct mpls_dev __rcu *mpls_ptr; |
|
Line 48... | Line 48... | |||
48 | #endif |
48 | #endif |
|
49 | |
49 | |
|
Line 54... | Line 54... | |||
54 | /* |
54 | /* |
|
55 | * Cache lines mostly used on receive path (including eth_type_trans()) |
55 | * Cache lines mostly used on receive path (including eth_type_trans()) |
|
56 | */ |
56 | */ |
|
57 | --- a/include/linux/skbuff.h |
57 | --- a/include/linux/skbuff.h |
|
58 | +++ b/include/linux/skbuff.h |
58 | +++ b/include/linux/skbuff.h |
|
59 | @@ -2512,6 +2512,10 @@ static inline int pskb_trim(struct sk_bu |
59 | @@ -2491,6 +2491,10 @@ static inline int pskb_trim(struct sk_bu |
|
60 | return (len < skb->len) ? __pskb_trim(skb, len) : 0; |
60 | return (len < skb->len) ? __pskb_trim(skb, len) : 0; |
|
61 | } |
61 | } |
|
Line 62... | Line 62... | |||
62 | |
62 | |
|
63 | +extern struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev, |
63 | +extern struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev, |
|
64 | + unsigned int length, gfp_t gfp); |
64 | + unsigned int length, gfp_t gfp); |
|
65 | + |
65 | + |
|
66 | + |
66 | + |
|
67 | /** |
67 | /** |
|
68 | * pskb_trim_unique - remove end from a paged unique (not cloned) buffer |
68 | * pskb_trim_unique - remove end from a paged unique (not cloned) buffer |
|
69 | * @skb: buffer to alter |
69 | * @skb: buffer to alter |
|
70 | @@ -2642,16 +2646,6 @@ static inline struct sk_buff *dev_alloc_ |
70 | @@ -2621,16 +2625,6 @@ static inline struct sk_buff *dev_alloc_ |
|
Line 71... | Line 71... | |||
71 | } |
71 | } |
|
72 | |
72 | |
|
Line 99... | Line 99... | |||
99 | config WANT_COMPAT_NETLINK_MESSAGES |
99 | config WANT_COMPAT_NETLINK_MESSAGES |
|
100 | bool |
100 | bool |
|
101 | help |
101 | help |
|
102 | --- a/net/core/dev.c |
102 | --- a/net/core/dev.c |
|
103 | +++ b/net/core/dev.c |
103 | +++ b/net/core/dev.c |
|
104 | @@ -3004,10 +3004,20 @@ static int xmit_one(struct sk_buff *skb, |
104 | @@ -2982,10 +2982,20 @@ static int xmit_one(struct sk_buff *skb, |
|
105 | if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) |
105 | if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) |
|
106 | dev_queue_xmit_nit(skb, dev); |
106 | dev_queue_xmit_nit(skb, dev); |
|
Line 107... | Line 107... | |||
107 | |
107 | |
|
108 | - len = skb->len; |
108 | - len = skb->len; |
|
Line 134... | Line 134... | |||
134 | #include <linux/if_vlan.h> |
134 | #include <linux/if_vlan.h> |
|
135 | +#include <linux/if.h> |
135 | +#include <linux/if.h> |
|
Line 136... | Line 136... | |||
136 | |
136 | |
|
137 | #include <net/protocol.h> |
137 | #include <net/protocol.h> |
|
138 | #include <net/dst.h> |
138 | #include <net/dst.h> |
|
139 | @@ -503,6 +504,22 @@ skb_fail: |
139 | @@ -499,6 +500,22 @@ skb_fail: |
|
140 | } |
140 | } |
|
Line 141... | Line 141... | |||
141 | EXPORT_SYMBOL(__napi_alloc_skb); |
141 | EXPORT_SYMBOL(__napi_alloc_skb); |
|
142 | |
142 | |