mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 23:42:43 +00:00
refresh 2.6.32 patches
SVN-Revision: 23735
This commit is contained in:
parent
5aaa91d3ca
commit
a621fdb419
@ -127,10 +127,11 @@
|
||||
|
||||
e = (struct ipt_entry *)(loc_cpu_entry + off);
|
||||
if (copy_to_user(userptr + off
|
||||
@@ -1002,6 +1042,14 @@ copy_entries_to_user(unsigned int total_
|
||||
@@ -1001,6 +1041,14 @@ copy_entries_to_user(unsigned int total_
|
||||
ret = -EFAULT;
|
||||
goto free_counters;
|
||||
}
|
||||
|
||||
+
|
||||
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
|
||||
+ if (copy_to_user(userptr + off
|
||||
+ + offsetof(struct ipt_entry, ip.flags),
|
||||
@ -138,7 +139,6 @@
|
||||
+ ret = -EFAULT;
|
||||
+ goto free_counters;
|
||||
+ }
|
||||
+
|
||||
|
||||
for (i = sizeof(struct ipt_entry);
|
||||
i < e->target_offset;
|
||||
i += m->u.match_size) {
|
||||
|
@ -1109,7 +1109,7 @@
|
||||
new->csum = old->csum;
|
||||
new->local_df = old->local_df;
|
||||
new->pkt_type = old->pkt_type;
|
||||
@@ -2776,6 +2879,13 @@ void __init skb_init(void)
|
||||
@@ -2781,6 +2884,13 @@ void __init skb_init(void)
|
||||
0,
|
||||
SLAB_HWCACHE_ALIGN|SLAB_PANIC,
|
||||
NULL);
|
||||
|
@ -11038,14 +11038,14 @@
|
||||
+ yaffs_UnpackTags2(tags, &pt);
|
||||
+ }
|
||||
+ }
|
||||
|
||||
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||
- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||
+
|
||||
+ if (localData)
|
||||
+ yaffs_ReleaseTempBuffer(dev, data, __LINE__);
|
||||
|
||||
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||
+ if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||
+ tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||
tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||
-
|
||||
if (retval == 0)
|
||||
return YAFFS_OK;
|
||||
else
|
||||
|
@ -343,7 +343,10 @@
|
||||
+static int ssb_pcmcia_get_mac(struct pcmcia_device *p_dev,
|
||||
+ tuple_t *tuple,
|
||||
+ void *priv)
|
||||
+{
|
||||
{
|
||||
- tuple_t tuple;
|
||||
- int res;
|
||||
- unsigned char buf[32];
|
||||
+ struct ssb_sprom *sprom = priv;
|
||||
+
|
||||
+ if (tuple->TupleData[0] != CISTPL_FUNCE_LAN_NODE_ID)
|
||||
@ -359,10 +362,7 @@
|
||||
+static int ssb_pcmcia_do_get_invariants(struct pcmcia_device *p_dev,
|
||||
+ tuple_t *tuple,
|
||||
+ void *priv)
|
||||
{
|
||||
- tuple_t tuple;
|
||||
- int res;
|
||||
- unsigned char buf[32];
|
||||
+{
|
||||
+ struct ssb_init_invariants *iv = priv;
|
||||
struct ssb_sprom *sprom = &iv->sprom;
|
||||
struct ssb_boardinfo *bi = &iv->boardinfo;
|
||||
|
@ -68,7 +68,7 @@
|
||||
* macro override instead of weak attribute alias, to workaround
|
||||
--- a/kernel/sched.c
|
||||
+++ b/kernel/sched.c
|
||||
@@ -6165,6 +6165,7 @@ int can_nice(const struct task_struct *p
|
||||
@@ -6224,6 +6224,7 @@ int can_nice(const struct task_struct *p
|
||||
return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
|
||||
capable(CAP_SYS_NICE));
|
||||
}
|
||||
@ -114,7 +114,7 @@
|
||||
void *caller)
|
||||
--- a/include/linux/mm.h
|
||||
+++ b/include/linux/mm.h
|
||||
@@ -713,6 +713,7 @@ extern void show_free_areas(void);
|
||||
@@ -717,6 +717,7 @@ extern void show_free_areas(void);
|
||||
|
||||
int shmem_lock(struct file *file, int lock, struct user_struct *user);
|
||||
struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
|
||||
|
Loading…
Reference in New Issue
Block a user