qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 18:23:09 +02:00
Code

kernel: update linux 3.6 to 3.6.4

Browse Source 
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33982 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2012-10-28 18:59:39 +00:00
parent ca706d1e01
commit 4e2267ffdd
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-version.mk
View File

@ -41,8 +41,8 @@ endif
ifeq ($(LINUX_VERSION),3.3.8) ifeq ($(LINUX_VERSION),3.3.8)
LINUX_KERNEL_MD5SUM:=21068f0fd262b9b3670947f7892e1d6b LINUX_KERNEL_MD5SUM:=21068f0fd262b9b3670947f7892e1d6b
endif endif
ifeq ($(LINUX_VERSION),3.6.3) ifeq ($(LINUX_VERSION),3.6.4)
LINUX_KERNEL_MD5SUM:=d4892b696956e5ce7b84464d721b6565 LINUX_KERNEL_MD5SUM:=a9ef3e479b47ef31d5a6c71a49aacf52
endif endif
# disable the md5sum check for unknown kernel versions # disable the md5sum check for unknown kernel versions

4
target/linux/generic/patches-3.6/643-bridge_remove_ipv6_dependency.patch
View File

@ -49,7 +49,7 @@
int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
unsigned char banned_flags) unsigned char banned_flags)
@@ -4808,6 +4807,9 @@ int __init addrconf_init(void) @@ -4811,6 +4810,9 @@ int __init addrconf_init(void)
ipv6_addr_label_rtnl_register(); ipv6_addr_label_rtnl_register();
@ -59,7 +59,7 @@
return 0; return 0;
errout: errout:
rtnl_af_unregister(&inet6_ops); rtnl_af_unregister(&inet6_ops);
@@ -4826,6 +4828,9 @@ void addrconf_cleanup(void) @@ -4829,6 +4831,9 @@ void addrconf_cleanup(void)
struct net_device *dev; struct net_device *dev;
int i; int i;

2
target/linux/generic/patches-3.6/653-disable_netlink_trim.patch
View File

@ -1,6 +1,6 @@
--- a/net/netlink/af_netlink.c --- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c
@@ -880,25 +880,7 @@ void netlink_detachskb(struct sock *sk, @@ -882,25 +882,7 @@ void netlink_detachskb(struct sock *sk,
static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation) static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation)
{ {

2
target/linux/generic/patches-3.6/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
@@ -1626,7 +1626,7 @@ static inline int pskb_network_may_pull( @@ -1623,7 +1623,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.6/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
@@ -1656,6 +1656,10 @@ static inline int pskb_trim(struct sk_bu @@ -1653,6 +1653,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
@@ -1758,16 +1762,6 @@ static inline struct sk_buff *dev_alloc_ @@ -1755,16 +1759,6 @@ static inline struct sk_buff *dev_alloc_
} }