From 8b6ada275e0edeec48fa6f0da3287bda78fb4014 Mon Sep 17 00:00:00 2001 From: juhosg Date: Tue, 19 Feb 2013 09:17:38 +0000 Subject: kernel: update linux 3.8-rcX to 3.8 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35672 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic/patches-3.8/100-overlayfs.patch | 2 +- target/linux/generic/patches-3.8/102-ehci_hcd_ignore_oc.patch | 2 +- target/linux/generic/patches-3.8/630-packet_socket_type.patch | 6 +++--- .../generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch | 4 ++-- .../generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch | 2 +- .../generic/patches-3.8/811-pci_disable_usb_common_quirks.patch | 2 +- .../generic/patches-3.8/820-usb_add_usb_find_device_by_name.patch | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) (limited to 'target/linux/generic/patches-3.8') diff --git a/target/linux/generic/patches-3.8/100-overlayfs.patch b/target/linux/generic/patches-3.8/100-overlayfs.patch index 04a058ff1..5d481174c 100644 --- a/target/linux/generic/patches-3.8/100-overlayfs.patch +++ b/target/linux/generic/patches-3.8/100-overlayfs.patch @@ -3175,7 +3175,7 @@ int flags, const char *name, --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -5667,6 +5667,13 @@ F: drivers/scsi/osd/ +@@ -5666,6 +5666,13 @@ F: drivers/scsi/osd/ F: include/scsi/osd_* F: fs/exofs/ diff --git a/target/linux/generic/patches-3.8/102-ehci_hcd_ignore_oc.patch b/target/linux/generic/patches-3.8/102-ehci_hcd_ignore_oc.patch index 63d115636..92f897f9f 100644 --- a/target/linux/generic/patches-3.8/102-ehci_hcd_ignore_oc.patch +++ b/target/linux/generic/patches-3.8/102-ehci_hcd_ignore_oc.patch @@ -40,7 +40,7 @@ Signed-off-by: Florian Fainelli mask = PORT_CSC | PORT_PEC | PORT_OCC; else mask = PORT_CSC | PORT_PEC; -@@ -825,7 +825,7 @@ static int ehci_hub_control ( +@@ -829,7 +829,7 @@ static int ehci_hub_control ( if (temp & PORT_PEC) status |= USB_PORT_STAT_C_ENABLE << 16; diff --git a/target/linux/generic/patches-3.8/630-packet_socket_type.patch b/target/linux/generic/patches-3.8/630-packet_socket_type.patch index 921c810f0..0671a28e9 100644 --- a/target/linux/generic/patches-3.8/630-packet_socket_type.patch +++ b/target/linux/generic/patches-3.8/630-packet_socket_type.patch @@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -2537,6 +2539,7 @@ static int packet_create(struct net *net +@@ -2539,6 +2541,7 @@ static int packet_create(struct net *net spin_lock_init(&po->bind_lock); mutex_init(&po->pg_vec_lock); po->prot_hook.func = packet_rcv; @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3150,6 +3153,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3152,6 +3155,16 @@ packet_setsockopt(struct socket *sock, i po->tp_tx_has_off = !!val; return 0; } @@ -108,7 +108,7 @@ Signed-off-by: Felix Fietkau default: return -ENOPROTOOPT; } -@@ -3204,6 +3217,13 @@ static int packet_getsockopt(struct sock +@@ -3206,6 +3219,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; diff --git a/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch index b3746978d..0a963342c 100644 --- a/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch +++ b/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch @@ -49,7 +49,7 @@ int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, unsigned char banned_flags) -@@ -4946,6 +4945,9 @@ int __init addrconf_init(void) +@@ -4947,6 +4946,9 @@ int __init addrconf_init(void) ipv6_addr_label_rtnl_register(); @@ -59,7 +59,7 @@ return 0; errout: rtnl_af_unregister(&inet6_ops); -@@ -4964,6 +4966,9 @@ void addrconf_cleanup(void) +@@ -4965,6 +4967,9 @@ void addrconf_cleanup(void) struct net_device *dev; int i; diff --git a/target/linux/generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch index 4d8161eb1..8eb8560a5 100644 --- a/target/linux/generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch +++ b/target/linux/generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch @@ -119,7 +119,7 @@ extern struct net_bridge_port *br_get_port(struct net_bridge *br, --- a/net/bridge/br_stp_bpdu.c +++ b/net/bridge/br_stp_bpdu.c -@@ -52,7 +52,7 @@ static void br_send_bpdu(struct net_brid +@@ -54,7 +54,7 @@ static void br_send_bpdu(struct net_brid skb_reset_mac_header(skb); diff --git a/target/linux/generic/patches-3.8/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.8/811-pci_disable_usb_common_quirks.patch index a2e223907..1486e0df4 100644 --- a/target/linux/generic/patches-3.8/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/patches-3.8/811-pci_disable_usb_common_quirks.patch @@ -39,7 +39,7 @@ static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) { u16 cmd; -@@ -973,3 +988,4 @@ static void quirk_usb_early_handoff(stru +@@ -974,3 +989,4 @@ static void quirk_usb_early_handoff(stru } DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff); diff --git a/target/linux/generic/patches-3.8/820-usb_add_usb_find_device_by_name.patch b/target/linux/generic/patches-3.8/820-usb_add_usb_find_device_by_name.patch index 72b223789..5ffd451a6 100644 --- a/target/linux/generic/patches-3.8/820-usb_add_usb_find_device_by_name.patch +++ b/target/linux/generic/patches-3.8/820-usb_add_usb_find_device_by_name.patch @@ -74,7 +74,7 @@ * @dev: device the buffer will be used with --- a/include/linux/usb.h +++ b/include/linux/usb.h -@@ -675,6 +675,7 @@ static inline bool usb_device_supports_l +@@ -677,6 +677,7 @@ static inline bool usb_device_supports_l return udev->bos->ss_cap->bmAttributes & USB_LTM_SUPPORT; } -- cgit v1.2.3