diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2008-06-11 11:59:45 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2008-06-11 11:59:45 +0000 |
| commit | 057b87f6855c015c8cf3a03ae51c752a30d109a4 (patch) | |
| tree | 7288c6930623f2195da013a237b291bd44605240 /target/linux/generic-2.6/patches-2.6.26 | |
| parent | 2eb6751084190c5fc42566103811e0f72e291eb8 (diff) | |
| download | upstream-057b87f6855c015c8cf3a03ae51c752a30d109a4.tar.gz upstream-057b87f6855c015c8cf3a03ae51c752a30d109a4.tar.bz2 upstream-057b87f6855c015c8cf3a03ae51c752a30d109a4.zip | |
upgrade orion to 2.6.26-rc5
SVN-Revision: 11436
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.26')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch | 10 | ||||
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.26/512-yaffs_2.6.25_fix.patch | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch index fbe2d91de7..542c54ebbf 100644 --- a/target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch +++ b/target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch @@ -599,7 +599,7 @@ select CRC32 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile -@@ -143,6 +143,7 @@ +@@ -142,6 +142,7 @@ obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o obj-$(CONFIG_DUMMY) += dummy.o @@ -643,7 +643,7 @@ +#endif /* _IP6T_IMQ_H */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -296,6 +296,10 @@ +@@ -300,6 +300,10 @@ struct nf_conntrack *nfct; struct sk_buff *nfct_reasm; #endif @@ -654,7 +654,7 @@ #ifdef CONFIG_BRIDGE_NETFILTER struct nf_bridge_info *nf_bridge; #endif -@@ -1736,6 +1740,10 @@ +@@ -1633,6 +1637,10 @@ dst->nfct_reasm = src->nfct_reasm; nf_conntrack_get_reasm(src->nfct_reasm); #endif @@ -677,7 +677,7 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/stat.h> -@@ -1537,7 +1540,11 @@ +@@ -1545,7 +1548,11 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) { if (likely(!skb->next)) { @@ -784,7 +784,7 @@ depends on IP_NF_FILTER --- a/net/ipv4/netfilter/Makefile +++ b/net/ipv4/netfilter/Makefile -@@ -55,6 +55,7 @@ +@@ -58,6 +58,7 @@ obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o diff --git a/target/linux/generic-2.6/patches-2.6.26/512-yaffs_2.6.25_fix.patch b/target/linux/generic-2.6/patches-2.6.26/512-yaffs_2.6.25_fix.patch index b0555789f3..ac895342f6 100644 --- a/target/linux/generic-2.6/patches-2.6.26/512-yaffs_2.6.25_fix.patch +++ b/target/linux/generic-2.6/patches-2.6.26/512-yaffs_2.6.25_fix.patch @@ -1,6 +1,6 @@ --- a/fs/yaffs2/yaffs_fs.c +++ b/fs/yaffs2/yaffs_fs.c -@@ -183,7 +183,13 @@ +@@ -181,7 +181,13 @@ #else static int yaffs_statfs(struct super_block *sb, struct statfs *buf); #endif @@ -14,7 +14,7 @@ static void yaffs_put_inode(struct inode *inode); static void yaffs_delete_inode(struct inode *); -@@ -286,7 +292,9 @@ +@@ -284,7 +290,9 @@ static struct super_operations yaffs_super_ops = { .statfs = yaffs_statfs, @@ -24,7 +24,7 @@ .put_inode = yaffs_put_inode, .put_super = yaffs_put_super, .delete_inode = yaffs_delete_inode, -@@ -848,11 +856,17 @@ +@@ -844,11 +852,17 @@ T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId)); @@ -42,7 +42,7 @@ return inode; } -@@ -1453,6 +1467,39 @@ +@@ -1427,6 +1441,39 @@ } @@ -82,7 +82,7 @@ static void yaffs_read_inode(struct inode *inode) { /* NB This is called as a side effect of other functions, but -@@ -1474,6 +1521,7 @@ +@@ -1448,6 +1495,7 @@ yaffs_GrossUnlock(dev); } |