projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
generic-2.6: update patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch
[openwrt.git]
/
target
/
linux
/
generic-2.6
/
patches-2.6.33
/
150-netfilter_imq.patch
diff --git
a/target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch
b/target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch
index
c6ace0d
..
9856761
100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch
+++ b/
target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch
@@
-851,17
+851,18
@@
/* Don't change this without changing skb_csum_unnecessary! */
#define CHECKSUM_NONE 0
/* Don't change this without changing skb_csum_unnecessary! */
#define CHECKSUM_NONE 0
-@@ -3
30,6 +333,9
@@ struct sk_buff {
- * first. This is owned by whoever has the skb queued ATM.
- */
-
char cb[48]
;
+@@ -3
23,6 +326,10
@@ struct sk_buff {
+ char cb[48] __aligned(8);
+
+
unsigned long _skb_dst
;
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
+ void *cb_next;
+#endif
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
+ void *cb_next;
+#endif
-
- unsigned int len,
- data_len;
-@@ -362,6 +368,9 @@ struct sk_buff {
++
+ #ifdef CONFIG_XFRM
+ struct sec_path *sp;
+ #endif
+@@ -357,6 +364,9 @@ struct sk_buff {
struct nf_conntrack *nfct;
struct sk_buff *nfct_reasm;
#endif
struct nf_conntrack *nfct;
struct sk_buff *nfct_reasm;
#endif
@@
-871,7
+872,7
@@
#ifdef CONFIG_BRIDGE_NETFILTER
struct nf_bridge_info *nf_bridge;
#endif
#ifdef CONFIG_BRIDGE_NETFILTER
struct nf_bridge_info *nf_bridge;
#endif
-@@ -3
83,6 +392
,10 @@ struct sk_buff {
+@@ -3
78,6 +388
,10 @@ struct sk_buff {
/* 0/14 bit hole */
/* 0/14 bit hole */
@@
-882,7
+883,7
@@
#ifdef CONFIG_NET_DMA
dma_cookie_t dma_cookie;
#endif
#ifdef CONFIG_NET_DMA
dma_cookie_t dma_cookie;
#endif
-@@ -4
31,6 +444
,12 @@ static inline struct rtable *skb_rtable(
+@@ -4
26,6 +440
,12 @@ static inline struct rtable *skb_rtable(
return (struct rtable *)skb_dst(skb);
}
return (struct rtable *)skb_dst(skb);
}
@@
-895,7
+896,7
@@
extern void kfree_skb(struct sk_buff *skb);
extern void consume_skb(struct sk_buff *skb);
extern void __kfree_skb(struct sk_buff *skb);
extern void kfree_skb(struct sk_buff *skb);
extern void consume_skb(struct sk_buff *skb);
extern void __kfree_skb(struct sk_buff *skb);
-@@ -197
5,6 +1994
,10 @@ static inline void __nf_copy(struct sk_b
+@@ -197
0,6 +1990
,10 @@ static inline void __nf_copy(struct sk_b
dst->nfct_reasm = src->nfct_reasm;
nf_conntrack_get_reasm(src->nfct_reasm);
#endif
dst->nfct_reasm = src->nfct_reasm;
nf_conntrack_get_reasm(src->nfct_reasm);
#endif
This page took
0.025282 seconds
and
4
git commands to generate.