diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2013-03-25 13:53:48 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2013-03-25 13:53:48 +0000 |
commit | 88c5f2bfbda358cf0c0a9a8da6c92cbe285ed53d (patch) | |
tree | 91d4b81c236dca887ae7fb049436e66275b3eadc /target/linux/generic | |
parent | a95842d49002114100ecaea5535c85c99b7ea587 (diff) | |
download | master-187ad058-88c5f2bfbda358cf0c0a9a8da6c92cbe285ed53d.tar.gz master-187ad058-88c5f2bfbda358cf0c0a9a8da6c92cbe285ed53d.tar.bz2 master-187ad058-88c5f2bfbda358cf0c0a9a8da6c92cbe285ed53d.zip |
[generic/3.9]: refresh patches against -rc4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36127 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
10 files changed, 11 insertions, 11 deletions
diff --git a/target/linux/generic/patches-3.9/060-hso_devices.patch b/target/linux/generic/patches-3.9/060-hso_devices.patch index 0080bd58b7..9354ed5d62 100644 --- a/target/linux/generic/patches-3.9/060-hso_devices.patch +++ b/target/linux/generic/patches-3.9/060-hso_devices.patch @@ -15,7 +15,7 @@ {USB_DEVICE(0x0af0, 0xd155)}, --- a/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, 0 ), diff --git a/target/linux/generic/patches-3.9/100-overlayfs.patch b/target/linux/generic/patches-3.9/100-overlayfs.patch index 2931e04c46..a4bb686e9b 100644 --- a/target/linux/generic/patches-3.9/100-overlayfs.patch +++ b/target/linux/generic/patches-3.9/100-overlayfs.patch @@ -243,7 +243,7 @@ will be called when part or all of the page is to be removed --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -5872,6 +5872,13 @@ F: drivers/scsi/osd/ +@@ -5905,6 +5905,13 @@ F: drivers/scsi/osd/ F: include/scsi/osd_* F: fs/exofs/ diff --git a/target/linux/generic/patches-3.9/102-ehci_hcd_ignore_oc.patch b/target/linux/generic/patches-3.9/102-ehci_hcd_ignore_oc.patch index b133dd6721..ee4e857af4 100644 --- a/target/linux/generic/patches-3.9/102-ehci_hcd_ignore_oc.patch +++ b/target/linux/generic/patches-3.9/102-ehci_hcd_ignore_oc.patch @@ -20,7 +20,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org> --- a/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", ((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f), temp >> 8, temp & 0xff, diff --git a/target/linux/generic/patches-3.9/203-kallsyms_uncompressed.patch b/target/linux/generic/patches-3.9/203-kallsyms_uncompressed.patch index 0367101746..3feca4ffe3 100644 --- a/target/linux/generic/patches-3.9/203-kallsyms_uncompressed.patch +++ b/target/linux/generic/patches-3.9/203-kallsyms_uncompressed.patch @@ -51,7 +51,7 @@ } else if (argc != 1) --- a/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. diff --git a/target/linux/generic/patches-3.9/450-mtd_plat_nand_chip_fixup.patch b/target/linux/generic/patches-3.9/450-mtd_plat_nand_chip_fixup.patch index f1783d0de3..c82c176271 100644 --- a/target/linux/generic/patches-3.9/450-mtd_plat_nand_chip_fixup.patch +++ b/target/linux/generic/patches-3.9/450-mtd_plat_nand_chip_fixup.patch @@ -5,7 +5,7 @@ --- a/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 bbt_options; const char **part_probe_types; diff --git a/target/linux/generic/patches-3.9/640-bridge_no_eap_forward.patch b/target/linux/generic/patches-3.9/640-bridge_no_eap_forward.patch index 5f075c31d8..50e35c0f41 100644 --- a/target/linux/generic/patches-3.9/640-bridge_no_eap_forward.patch +++ b/target/linux/generic/patches-3.9/640-bridge_no_eap_forward.patch @@ -12,4 +12,4 @@ + } else if (is_broadcast_ether_addr(dest)) skb2 = skb; else if (is_multicast_ether_addr(dest)) { - mdst = br_mdb_get(br, skb); + mdst = br_mdb_get(br, skb, vid); diff --git a/target/linux/generic/patches-3.9/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.9/644-bridge_optimize_netfilter_hooks.patch index 177715829a..45114c8ef4 100644 --- a/target/linux/generic/patches-3.9/644-bridge_optimize_netfilter_hooks.patch +++ b/target/linux/generic/patches-3.9/644-bridge_optimize_netfilter_hooks.patch @@ -58,7 +58,7 @@ default: --- a/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) { __skb_push(skb, sizeof(struct ethhdr)); skb->dev = port->dev; diff --git a/target/linux/generic/patches-3.9/655-increase_skb_pad.patch b/target/linux/generic/patches-3.9/655-increase_skb_pad.patch index 66be04f06c..6d0d3df841 100644 --- a/target/linux/generic/patches-3.9/655-increase_skb_pad.patch +++ b/target/linux/generic/patches-3.9/655-increase_skb_pad.patch @@ -1,6 +1,6 @@ --- a/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) */ #ifndef NET_SKB_PAD diff --git a/target/linux/generic/patches-3.9/721-phy_packets.patch b/target/linux/generic/patches-3.9/721-phy_packets.patch index 5af812199b..10fb731774 100644 --- a/target/linux/generic/patches-3.9/721-phy_packets.patch +++ b/target/linux/generic/patches-3.9/721-phy_packets.patch @@ -34,7 +34,7 @@ #define IF_GET_IFACE 0x0001 /* for querying only */ --- a/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; } @@ -45,7 +45,7 @@ /** * pskb_trim_unique - remove end from a paged unique (not cloned) buffer * @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_ } diff --git a/target/linux/generic/patches-3.9/930-crashlog.patch b/target/linux/generic/patches-3.9/930-crashlog.patch index 52697a47e2..867e5bb2f3 100644 --- a/target/linux/generic/patches-3.9/930-crashlog.patch +++ b/target/linux/generic/patches-3.9/930-crashlog.patch @@ -20,7 +20,7 @@ +#endif --- a/init/Kconfig +++ b/init/Kconfig -@@ -1145,6 +1145,10 @@ config RELAY +@@ -1141,6 +1141,10 @@ config RELAY If unsure, say N. |