Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refresh patches against -rc4

Browse source 
SVN-Revision: 36127
This commit is contained in:
Imre Kaloz 2013-03-25 13:53:48 +00:00
parent f26378fd7c
commit c90078ce87
10 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/generic/patches-3.9/060-hso_devices.patch
View file

@ -15,7 +15,7 @@
{USB_DEVICE(0x0af0, 0xd155)}, {USB_DEVICE(0x0af0, 0xd155)},
--- a/drivers/usb/storage/unusual_devs.h --- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h
@@ -1237,6 +1237,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0 @@ -1252,6 +1252,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
USB_SC_DEVICE, USB_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
0 ), 0 ),

2
target/linux/generic/patches-3.9/100-overlayfs.patch
View file

@ -243,7 +243,7 @@
will be called when part or all of the page is to be removed will be called when part or all of the page is to be removed
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -5872,6 +5872,13 @@ F: drivers/scsi/osd/ @@ -5905,6 +5905,13 @@ F: drivers/scsi/osd/
F: include/scsi/osd_* F: include/scsi/osd_*
F: fs/exofs/ F: fs/exofs/

2
target/linux/generic/patches-3.9/102-ehci_hcd_ignore_oc.patch
View file

@ -20,7 +20,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
--- a/drivers/usb/host/ehci-hcd.c --- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c
@@ -630,7 +630,7 @@ static int ehci_run (struct usb_hcd *hcd @@ -631,7 +631,7 @@ static int ehci_run (struct usb_hcd *hcd
"USB %x.%x started, EHCI %x.%02x%s\n", "USB %x.%x started, EHCI %x.%02x%s\n",
((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f), ((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f),
temp >> 8, temp & 0xff, temp >> 8, temp & 0xff,

2
target/linux/generic/patches-3.9/203-kallsyms_uncompressed.patch
View file

@ -51,7 +51,7 @@
} else if (argc != 1) } else if (argc != 1)
--- a/init/Kconfig --- a/init/Kconfig
+++ b/init/Kconfig +++ b/init/Kconfig
@@ -1263,6 +1263,17 @@ config KALLSYMS_ALL @@ -1259,6 +1259,17 @@ config KALLSYMS_ALL
Say N unless you really need all symbols. Say N unless you really need all symbols.

2
target/linux/generic/patches-3.9/450-mtd_plat_nand_chip_fixup.patch
View file

@ -5,7 +5,7 @@
--- a/include/linux/mtd/nand.h --- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h
@@ -647,6 +647,7 @@ struct platform_nand_chip { @@ -654,6 +654,7 @@ struct platform_nand_chip {
unsigned int options; unsigned int options;
unsigned int bbt_options; unsigned int bbt_options;
const char **part_probe_types; const char **part_probe_types;

2
target/linux/generic/patches-3.9/640-bridge_no_eap_forward.patch
View file

@ -12,4 +12,4 @@
+ } else if (is_broadcast_ether_addr(dest)) + } else if (is_broadcast_ether_addr(dest))
skb2 = skb; skb2 = skb;
else if (is_multicast_ether_addr(dest)) { else if (is_multicast_ether_addr(dest)) {
mdst = br_mdb_get(br, skb); mdst = br_mdb_get(br, skb, vid);

2
target/linux/generic/patches-3.9/644-bridge_optimize_netfilter_hooks.patch
View file

@ -58,7 +58,7 @@
default: default:
--- a/net/bridge/br_multicast.c --- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c
@@ -781,7 +781,7 @@ static void __br_multicast_send_query(st @@ -782,7 +782,7 @@ static void __br_multicast_send_query(st
if (port) { if (port) {
__skb_push(skb, sizeof(struct ethhdr)); __skb_push(skb, sizeof(struct ethhdr));
skb->dev = port->dev; skb->dev = port->dev;

2
target/linux/generic/patches-3.9/655-increase_skb_pad.patch
View file

@ -1,6 +1,6 @@
--- a/include/linux/skbuff.h --- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h +++ b/include/linux/skbuff.h
@@ -1751,7 +1751,7 @@ static inline int pskb_network_may_pull( @@ -1756,7 +1756,7 @@ static inline int pskb_network_may_pull(
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
*/ */
#ifndef NET_SKB_PAD #ifndef NET_SKB_PAD

4
target/linux/generic/patches-3.9/721-phy_packets.patch
View file

@ -34,7 +34,7 @@
#define IF_GET_IFACE 0x0001 /* for querying only */ #define IF_GET_IFACE 0x0001 /* for querying only */
--- a/include/linux/skbuff.h --- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h +++ b/include/linux/skbuff.h
@@ -1781,6 +1781,10 @@ static inline int pskb_trim(struct sk_bu @@ -1786,6 +1786,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0; return (len < skb->len) ? __pskb_trim(skb, len) : 0;
} }
@ -45,7 +45,7 @@
/** /**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer * pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter * @skb: buffer to alter
@@ -1887,16 +1891,6 @@ static inline struct sk_buff *dev_alloc_ @@ -1892,16 +1896,6 @@ static inline struct sk_buff *dev_alloc_
} }

2
target/linux/generic/patches-3.9/930-crashlog.patch
View file

@ -20,7 +20,7 @@
+#endif +#endif
--- a/init/Kconfig --- a/init/Kconfig
+++ b/init/Kconfig +++ b/init/Kconfig
@@ -1145,6 +1145,10 @@ config RELAY @@ -1141,6 +1141,10 @@ config RELAY
If unsure, say N. If unsure, say N.