domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: update linux 3.2 to 3.2.15

Browse Source 
SVN-Revision: 31335
This commit is contained in:
Jonas Gorski
2012-04-17 12:50:54 +00:00
parent cfe30549a1
commit ee4c47a134
80 changed files with 230 additions and 1113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/generic/patches-3.2/100-overlayfs_v11.patch
View File

@@ -3134,7 +3134,7 @@
/**
* enum positive_aop_returns - aop return codes with specific semantics
*
@@ -1482,6 +1488,11 @@ struct super_block {
@@ -1487,6 +1493,11 @@ struct super_block {
int cleancache_poolid;
struct shrinker s_shrink; /* per-sb shrinker handle */
@@ -3146,7 +3146,7 @@
};
/* superblock cache pruning functions */
@@ -1639,6 +1650,7 @@ struct inode_operations {
@@ -1644,6 +1655,7 @@ struct inode_operations {
void (*truncate_range)(struct inode *, loff_t, loff_t);
int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
u64 len);
@@ -3154,7 +3154,7 @@
} ____cacheline_aligned;
struct seq_file;
@@ -2059,6 +2071,7 @@ extern long do_sys_open(int dfd, const c
@@ -2064,6 +2076,7 @@ extern long do_sys_open(int dfd, const c
extern struct file *filp_open(const char *, int, int);
extern struct file *file_open_root(struct dentry *, struct vfsmount *,
const char *, int);

4
target/linux/generic/patches-3.2/120-ppp_txqueue_restart.patch
View File

@@ -54,11 +54,9 @@ Date: Mon Mar 26 00:03:42 2012 +0000
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
index 159da29..21d7151 100644
--- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
@@ -968,7 +968,6 @@ ppp_start_xmit(struct sk_buff *skb, struct net_device *dev)
@@ -968,7 +968,6 @@ ppp_start_xmit(struct sk_buff *skb, stru
proto = npindex_to_proto[npi];
put_unaligned_be16(proto, pp);

13
target/linux/generic/patches-3.2/130-pppoatm-queue-depth.patch
View File

@@ -34,8 +34,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
net/atm/pppoatm.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 85 insertions(+), 10 deletions(-)
diff --git a/net/atm/pppoatm.c b/net/atm/pppoatm.c
index 614d3fc..ce1e59f 100644
--- a/net/atm/pppoatm.c
+++ b/net/atm/pppoatm.c
@@ -62,12 +62,25 @@ struct pppoatm_vcc {
@@ -64,7 +62,7 @@ index 614d3fc..ce1e59f 100644
* Header used for LLC Encapsulated PPP (4 bytes) followed by the LCP protocol
* ID (0xC021) used in autodetection
*/
@@ -102,16 +115,30 @@ static void pppoatm_wakeup_sender(unsigned long arg)
@@ -102,16 +115,30 @@ static void pppoatm_wakeup_sender(unsign
static void pppoatm_pop(struct atm_vcc *atmvcc, struct sk_buff *skb)
{
struct pppoatm_vcc *pvcc = atmvcc_to_pvcc(atmvcc);
@@ -154,7 +152,7 @@ index 614d3fc..ce1e59f 100644
/*
* Called by the ppp_generic.c to send a packet - returns true if packet
* was accepted. If we return false, then it's our job to call
@@ -207,7 +279,7 @@ static int pppoatm_send(struct ppp_channel *chan, struct sk_buff *skb)
@@ -207,7 +279,7 @@ static int pppoatm_send(struct ppp_chann
struct sk_buff *n;
n = skb_realloc_headroom(skb, LLC_LEN);
if (n != NULL &&
@@ -163,7 +161,7 @@ index 614d3fc..ce1e59f 100644
kfree_skb(n);
goto nospace;
}
@@ -215,12 +287,12 @@ static int pppoatm_send(struct ppp_channel *chan, struct sk_buff *skb)
@@ -215,12 +287,12 @@ static int pppoatm_send(struct ppp_chann
skb = n;
if (skb == NULL)
return DROP_PACKET;
@@ -178,7 +176,7 @@ index 614d3fc..ce1e59f 100644
goto nospace;
break;
case e_autodetect:
@@ -285,6 +357,9 @@ static int pppoatm_assign_vcc(struct atm_vcc *atmvcc, void __user *arg)
@@ -285,6 +357,9 @@ static int pppoatm_assign_vcc(struct atm
if (pvcc == NULL)
return -ENOMEM;
pvcc->atmvcc = atmvcc;
@@ -188,6 +186,3 @@ index 614d3fc..ce1e59f 100644
pvcc->old_push = atmvcc->push;
pvcc->old_pop = atmvcc->pop;
pvcc->encaps = (enum pppoatm_encaps) be.encaps;
--
1.7.7.6

12
target/linux/generic/patches-3.2/440-block2mtd_init.patch
View File

@@ -40,8 +40,8 @@
+ dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
dev->mtd.erasesize = erase_size;
dev->mtd.writesize = 1;
dev->mtd.type = MTD_RAM;
@@ -294,14 +299,17 @@ static struct block2mtd_dev *add_device(
dev->mtd.writebufsize = PAGE_SIZE;
@@ -295,14 +300,17 @@ static struct block2mtd_dev *add_device(
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;
@@ -62,7 +62,7 @@
return dev;
devinit_err:
@@ -374,9 +382,9 @@ static char block2mtd_paramline[80 + 12]
@@ -375,9 +383,9 @@ static char block2mtd_paramline[80 + 12]
static int block2mtd_setup2(const char *val)
{
@@ -74,7 +74,7 @@
char *name;
size_t erase_size = PAGE_SIZE;
int i, ret;
@@ -387,7 +395,7 @@ static int block2mtd_setup2(const char *
@@ -388,7 +396,7 @@ static int block2mtd_setup2(const char *
strcpy(str, val);
kill_final_newline(str);
@@ -83,7 +83,7 @@
token[i] = strsep(&str, ",");
if (str)
@@ -406,8 +414,10 @@ static int block2mtd_setup2(const char *
@@ -407,8 +415,10 @@ static int block2mtd_setup2(const char *
parse_err("illegal erase size");
}
}
@@ -95,7 +95,7 @@
return 0;
}
@@ -441,7 +451,7 @@ static int block2mtd_setup(const char *v
@@ -442,7 +452,7 @@ static int block2mtd_setup(const char *v
module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);

2
target/linux/generic/patches-3.2/441-block2mtd_refresh.patch
View File

@@ -281,7 +281,7 @@
/* Setup the MTD structure */
/* make the name contain the block device in */
@@ -298,6 +392,7 @@ static struct block2mtd_dev *add_device(
@@ -299,6 +393,7 @@ static struct block2mtd_dev *add_device(
dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;