diff options
| author | Florian Fainelli <florian@openwrt.org> | 2011-08-10 11:37:21 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2011-08-10 11:37:21 +0000 |
| commit | 0e40c19b45e2e93e738eab14313e296a7256fe99 (patch) | |
| tree | 23cd049ecf5208949f78e0fafc2caf6c887dcbdf /target/linux/generic/patches-2.6.39 | |
| parent | 458716389c2cc7542e6c8efabc1fde8ad61d4137 (diff) | |
| download | upstream-0e40c19b45e2e93e738eab14313e296a7256fe99.tar.gz upstream-0e40c19b45e2e93e738eab14313e296a7256fe99.tar.bz2 upstream-0e40c19b45e2e93e738eab14313e296a7256fe99.zip | |
add ignore_oc in struct ehci_hcd
SVN-Revision: 27945
Diffstat (limited to 'target/linux/generic/patches-2.6.39')
| -rw-r--r-- | target/linux/generic/patches-2.6.39/102-ehci_hcd_ignore_oc.patch | 41 | ||||
| -rw-r--r-- | target/linux/generic/patches-2.6.39/610-netfilter_match_bypass_default_checks.patch | 8 |
2 files changed, 45 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.39/102-ehci_hcd_ignore_oc.patch b/target/linux/generic/patches-2.6.39/102-ehci_hcd_ignore_oc.patch new file mode 100644 index 0000000000..f98d8ee02f --- /dev/null +++ b/target/linux/generic/patches-2.6.39/102-ehci_hcd_ignore_oc.patch @@ -0,0 +1,41 @@ +--- a/drivers/usb/host/ehci-hcd.c ++++ b/drivers/usb/host/ehci-hcd.c +@@ -744,7 +744,7 @@ static int ehci_run (struct usb_hcd *hcd + "USB %x.%x started, EHCI %x.%02x%s\n", + ((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f), + temp >> 8, temp & 0xff, +- ignore_oc ? ", overcurrent ignored" : ""); ++ (ignore_oc || ehci->ignore_oc) ? ", overcurrent ignored" : ""); + + ehci_writel(ehci, INTR_MASK, + &ehci->regs->intr_enable); /* Turn On Interrupts */ +--- a/drivers/usb/host/ehci-hub.c ++++ b/drivers/usb/host/ehci-hub.c +@@ -655,7 +655,7 @@ ehci_hub_status_data (struct usb_hcd *hc + * always set, seem to clear PORT_OCC and PORT_CSC when writing to + * PORT_POWER; that's surprising, but maybe within-spec. + */ +- if (!ignore_oc) ++ if (!ignore_oc || !ehci->ignore_oc) + mask = PORT_CSC | PORT_PEC | PORT_OCC; + else + mask = PORT_CSC | PORT_PEC; +@@ -873,7 +873,7 @@ static int ehci_hub_control ( + if (temp & PORT_PEC) + status |= USB_PORT_STAT_C_ENABLE << 16; + +- if ((temp & PORT_OCC) && !ignore_oc){ ++ if ((temp & PORT_OCC) && (!ignore_oc || !ehci->ignore_oc)){ + status |= USB_PORT_STAT_C_OVERCURRENT << 16; + + /* +--- a/drivers/usb/host/ehci.h ++++ b/drivers/usb/host/ehci.h +@@ -134,6 +134,7 @@ struct ehci_hcd { /* one per controlle + unsigned amd_pll_fix:1; + unsigned fs_i_thresh:1; /* Intel iso scheduling */ + unsigned use_dummy_qh:1; /* AMD Frame List table quirk*/ ++ unsigned ignore_oc:1; + + /* required for usb32 quirk */ + #define OHCI_CTRL_HCFS (3 << 6) diff --git a/target/linux/generic/patches-2.6.39/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/patches-2.6.39/610-netfilter_match_bypass_default_checks.patch index 98c28c7433..c834beedd6 100644 --- a/target/linux/generic/patches-2.6.39/610-netfilter_match_bypass_default_checks.patch +++ b/target/linux/generic/patches-2.6.39/610-netfilter_match_bypass_default_checks.patch @@ -76,10 +76,11 @@ counters = alloc_counters(table); if (IS_ERR(counters)) -@@ -967,6 +996,14 @@ copy_entries_to_user(unsigned int total_ +@@ -966,6 +995,14 @@ copy_entries_to_user(unsigned int total_ + ret = -EFAULT; goto free_counters; } - ++ + flags = e->ip.flags & IPT_F_MASK; + if (copy_to_user(userptr + off + + offsetof(struct ipt_entry, ip.flags), @@ -87,7 +88,6 @@ + ret = -EFAULT; + goto free_counters; + } -+ + for (i = sizeof(struct ipt_entry); i < e->target_offset; - i += m->u.match_size) { |