diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-28 18:59:39 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-28 18:59:39 +0000 |
| commit | 4e2267ffdd054b88b15f9b4d8e63b6bb67cf8dc4 (patch) | |
| tree | bb180a1650aef67204581be635aead20adfb2021 /target | |
| parent | ca706d1e01677b1519bb43e34f185559f300a805 (diff) | |
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
Diffstat (limited to 'target')
4 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/patches-3.6/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.6/643-bridge_remove_ipv6_dependency.patch index 035bbf8bc..5bf629b5e 100644 --- a/target/linux/generic/patches-3.6/643-bridge_remove_ipv6_dependency.patch +++ b/target/linux/generic/patches-3.6/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) -@@ -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; diff --git a/target/linux/generic/patches-3.6/653-disable_netlink_trim.patch b/target/linux/generic/patches-3.6/653-disable_netlink_trim.patch index bfd297b12..274d0d2f8 100644 --- a/target/linux/generic/patches-3.6/653-disable_netlink_trim.patch +++ b/target/linux/generic/patches-3.6/653-disable_netlink_trim.patch @@ -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) { diff --git a/target/linux/generic/patches-3.6/655-increase_skb_pad.patch b/target/linux/generic/patches-3.6/655-increase_skb_pad.patch index 69b259f95..c67a6a479 100644 --- a/target/linux/generic/patches-3.6/655-increase_skb_pad.patch +++ b/target/linux/generic/patches-3.6/655-increase_skb_pad.patch @@ -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 diff --git a/target/linux/generic/patches-3.6/721-phy_packets.patch b/target/linux/generic/patches-3.6/721-phy_packets.patch index e8578de57..3a0fdc95b 100644 --- a/target/linux/generic/patches-3.6/721-phy_packets.patch +++ b/target/linux/generic/patches-3.6/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 -@@ -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_ } |