refresh kernel patches
SVN-Revision: 21694
This commit is contained in:
parent
478e2efca7
commit
1428b8f9bc
21 changed files with 69 additions and 69 deletions
|
@ -127,10 +127,11 @@
|
||||||
|
|
||||||
e = (struct ipt_entry *)(loc_cpu_entry + off);
|
e = (struct ipt_entry *)(loc_cpu_entry + off);
|
||||||
if (copy_to_user(userptr + 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;
|
goto free_counters;
|
||||||
}
|
}
|
||||||
|
+
|
||||||
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
|
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
|
||||||
+ if (copy_to_user(userptr + off
|
+ if (copy_to_user(userptr + off
|
||||||
+ + offsetof(struct ipt_entry, ip.flags),
|
+ + offsetof(struct ipt_entry, ip.flags),
|
||||||
|
@ -138,7 +139,6 @@
|
||||||
+ ret = -EFAULT;
|
+ ret = -EFAULT;
|
||||||
+ goto free_counters;
|
+ goto free_counters;
|
||||||
+ }
|
+ }
|
||||||
+
|
|
||||||
for (i = sizeof(struct ipt_entry);
|
for (i = sizeof(struct ipt_entry);
|
||||||
i < e->target_offset;
|
i < e->target_offset;
|
||||||
i += m->u.match_size) {
|
|
||||||
|
|
|
@ -11038,14 +11038,14 @@
|
||||||
+ yaffs_UnpackTags2(tags, &pt);
|
+ yaffs_UnpackTags2(tags, &pt);
|
||||||
+ }
|
+ }
|
||||||
+ }
|
+ }
|
||||||
|
+
|
||||||
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
|
||||||
- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
|
||||||
+ if (localData)
|
+ if (localData)
|
||||||
+ yaffs_ReleaseTempBuffer(dev, data, __LINE__);
|
+ 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)
|
+ 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)
|
if (retval == 0)
|
||||||
return YAFFS_OK;
|
return YAFFS_OK;
|
||||||
else
|
else
|
||||||
|
|
|
@ -404,7 +404,10 @@
|
||||||
+static int ssb_pcmcia_get_mac(struct pcmcia_device *p_dev,
|
+static int ssb_pcmcia_get_mac(struct pcmcia_device *p_dev,
|
||||||
+ tuple_t *tuple,
|
+ tuple_t *tuple,
|
||||||
+ void *priv)
|
+ void *priv)
|
||||||
+{
|
{
|
||||||
|
- tuple_t tuple;
|
||||||
|
- int res;
|
||||||
|
- unsigned char buf[32];
|
||||||
+ struct ssb_sprom *sprom = priv;
|
+ struct ssb_sprom *sprom = priv;
|
||||||
+
|
+
|
||||||
+ if (tuple->TupleData[0] != CISTPL_FUNCE_LAN_NODE_ID)
|
+ if (tuple->TupleData[0] != CISTPL_FUNCE_LAN_NODE_ID)
|
||||||
|
@ -420,10 +423,7 @@
|
||||||
+static int ssb_pcmcia_do_get_invariants(struct pcmcia_device *p_dev,
|
+static int ssb_pcmcia_do_get_invariants(struct pcmcia_device *p_dev,
|
||||||
+ tuple_t *tuple,
|
+ tuple_t *tuple,
|
||||||
+ void *priv)
|
+ void *priv)
|
||||||
{
|
+{
|
||||||
- tuple_t tuple;
|
|
||||||
- int res;
|
|
||||||
- unsigned char buf[32];
|
|
||||||
+ struct ssb_init_invariants *iv = priv;
|
+ struct ssb_init_invariants *iv = priv;
|
||||||
struct ssb_sprom *sprom = &iv->sprom;
|
struct ssb_sprom *sprom = &iv->sprom;
|
||||||
struct ssb_boardinfo *bi = &iv->boardinfo;
|
struct ssb_boardinfo *bi = &iv->boardinfo;
|
||||||
|
|
Loading…
Reference in a new issue