mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 05:34:36 +02:00
kernel: update linux 3.6 to 3.6.4
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:
parent
ca706d1e01
commit
4e2267ffdd
@ -41,8 +41,8 @@ endif
|
||||
ifeq ($(LINUX_VERSION),3.3.8)
|
||||
LINUX_KERNEL_MD5SUM:=21068f0fd262b9b3670947f7892e1d6b
|
||||
endif
|
||||
ifeq ($(LINUX_VERSION),3.6.3)
|
||||
LINUX_KERNEL_MD5SUM:=d4892b696956e5ce7b84464d721b6565
|
||||
ifeq ($(LINUX_VERSION),3.6.4)
|
||||
LINUX_KERNEL_MD5SUM:=a9ef3e479b47ef31d5a6c71a49aacf52
|
||||
endif
|
||||
|
||||
# disable the md5sum check for unknown kernel versions
|
||||
|
@ -49,7 +49,7 @@
|
||||
|
||||
int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
|
||||
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();
|
||||
|
||||
@ -59,7 +59,7 @@
|
||||
return 0;
|
||||
errout:
|
||||
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;
|
||||
int i;
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/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)
|
||||
{
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/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)
|
||||
*/
|
||||
#ifndef NET_SKB_PAD
|
||||
|
@ -34,7 +34,7 @@
|
||||
#define IF_GET_IFACE 0x0001 /* for querying only */
|
||||
--- a/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;
|
||||
}
|
||||
|
||||
@ -45,7 +45,7 @@
|
||||
/**
|
||||
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
|
||||
* @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_
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user