Changeset 41553


Ignore:
Timestamp:
2014-07-09T01:27:45+02:00 (4 years ago)
Author:
luka
Message:

kernel: 3.13: refresh patches

Signed-off-by: Luka Perkov <luka@…>

Location:
trunk/target/linux/generic/patches-3.13
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-3.13/020-ssb_update.patch

    r40833 r41553  
    8181 { 
    8282        struct ssb_bus *bus = ssb_gpio_get_bus(chip); 
    83 @@ -74,19 +98,129 @@ static void ssb_gpio_chipco_free(struct  
     83@@ -74,19 +98,129 @@ static void ssb_gpio_chipco_free(struct 
    8484        ssb_chipco_gpio_pullup(&bus->chipco, 1 << gpio, 0); 
    8585 } 
  • trunk/target/linux/generic/patches-3.13/555-gluebi-sysfs-support.patch

    r40306 r41553  
    1 Index: linux-3.13.2/drivers/mtd/ubi/gluebi.c 
    2 =================================================================== 
    3 --- linux-3.13.2.orig/drivers/mtd/ubi/gluebi.c 
    4 +++ linux-3.13.2/drivers/mtd/ubi/gluebi.c 
     1--- a/drivers/mtd/ubi/gluebi.c 
     2+++ b/drivers/mtd/ubi/gluebi.c 
    53@@ -38,6 +38,7 @@ 
    64 #include <linux/mutex.h> 
  • trunk/target/linux/generic/patches-3.13/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch

    r40830 r41553  
    1515 3 files changed, 291 insertions(+), 11 deletions(-) 
    1616 
    17 diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h 
    18 index a5593da..414f5a1 100644 
    1917--- a/include/net/ip6_tunnel.h 
    2018+++ b/include/net/ip6_tunnel.h 
     
    4644        __be16                  i_flags; 
    4745        __be16                  o_flags; 
    48 diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h 
    49 index aee73d0..c5b25d4 100644 
    5046--- a/include/uapi/linux/if_tunnel.h 
    5147+++ b/include/uapi/linux/if_tunnel.h 
     
    7470 #define        SIT_ISATAP      0x0001 
    7571  
    76 diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c 
    77 index b05b609..c2216b0 100644 
    7872--- a/net/ipv6/ip6_tunnel.c 
    7973+++ b/net/ipv6/ip6_tunnel.c 
     
    8781  
    8882 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 
    89 @@ -76,11 +78,9 @@ static bool log_ecn_error = true; 
     83@@ -80,11 +82,9 @@ static bool log_ecn_error = true; 
    9084 module_param(log_ecn_error, bool, 0644); 
    9185 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN"); 
     
    10195  
    10296 static int ip6_tnl_dev_init(struct net_device *dev); 
    103 @@ -179,15 +179,24 @@ EXPORT_SYMBOL_GPL(ip6_tnl_dst_store); 
     97@@ -182,15 +182,24 @@ EXPORT_SYMBOL_GPL(ip6_tnl_dst_store); 
    10498 static struct ip6_tnl * 
    10599 ip6_tnl_lookup(struct net *net, const struct in6_addr *remote, const struct in6_addr *local) 
     
    130124        t = rcu_dereference(ip6n->tnls_wc[0]); 
    131125        if (t && (t->dev->flags & IFF_UP)) 
    132 @@ -217,7 +226,7 @@ ip6_tnl_bucket(struct ip6_tnl_net *ip6n, const struct __ip6_tnl_parm *p) 
     126@@ -220,7 +229,7 @@ ip6_tnl_bucket(struct ip6_tnl_net *ip6n, 
    133127  
    134128        if (!ipv6_addr_any(remote) || !ipv6_addr_any(local)) { 
     
    139133        return &ip6n->tnls[prio][h]; 
    140134 } 
    141 @@ -385,6 +394,12 @@ ip6_tnl_dev_uninit(struct net_device *dev) 
     135@@ -388,6 +397,12 @@ ip6_tnl_dev_uninit(struct net_device *de 
    142136        struct net *net = t->net; 
    143137        struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id); 
     
    152146                RCU_INIT_POINTER(ip6n->tnls_wc[0], NULL); 
    153147        else 
    154 @@ -768,6 +783,108 @@ int ip6_tnl_rcv_ctl(struct ip6_tnl *t, 
     148@@ -771,6 +786,108 @@ int ip6_tnl_rcv_ctl(struct ip6_tnl *t, 
    155149 } 
    156150 EXPORT_SYMBOL_GPL(ip6_tnl_rcv_ctl); 
     
    261255  * ip6_tnl_rcv - decapsulate IPv6 packet and retransmit it locally 
    262256  *   @skb: received socket buffer 
    263 @@ -812,6 +928,26 @@ static int ip6_tnl_rcv(struct sk_buff *skb, __u16 protocol, 
     257@@ -815,6 +932,26 @@ static int ip6_tnl_rcv(struct sk_buff *s 
    264258                skb_reset_network_header(skb); 
    265259                skb->protocol = htons(protocol); 
     
    288282                __skb_tunnel_rx(skb, t->dev, t->net); 
    289283  
    290 @@ -1072,6 +1208,7 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev) 
     284@@ -1075,6 +1212,7 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, str 
    291285        __u8 dsfield; 
    292286        __u32 mtu; 
     
    296290        if ((t->parms.proto != IPPROTO_IPIP && t->parms.proto != 0) || 
    297291            !ip6_tnl_xmit_ctl(t)) 
    298 @@ -1091,6 +1228,18 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev) 
     292@@ -1094,6 +1232,18 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, str 
    299293        if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK) 
    300294                fl6.flowi6_mark = skb->mark; 
     
    315309        if (err != 0) { 
    316310                /* XXX: send ICMP error even if DF is not set. */ 
    317 @@ -1259,6 +1408,14 @@ ip6_tnl_change(struct ip6_tnl *t, const struct __ip6_tnl_parm *p) 
     311@@ -1262,6 +1412,14 @@ ip6_tnl_change(struct ip6_tnl *t, const 
    318312        t->parms.flowinfo = p->flowinfo; 
    319313        t->parms.link = p->link; 
     
    330324        ip6_tnl_link_config(t); 
    331325        return 0; 
    332 @@ -1289,6 +1446,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_parm *p, const struct ip6_tnl_parm *u) 
     326@@ -1292,6 +1450,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_ 
    333327        p->flowinfo = u->flowinfo; 
    334328        p->link = u->link; 
     
    338332 } 
    339333  
    340 @@ -1569,6 +1727,15 @@ static int ip6_tnl_validate(struct nlattr *tb[], struct nlattr *data[]) 
     334@@ -1579,6 +1738,15 @@ static int ip6_tnl_validate(struct nlatt 
    341335        return 0; 
    342336 } 
     
    354348                                  struct __ip6_tnl_parm *parms) 
    355349 { 
    356 @@ -1602,6 +1769,46 @@ static void ip6_tnl_netlink_parms(struct nlattr *data[], 
     350@@ -1612,6 +1780,46 @@ static void ip6_tnl_netlink_parms(struct 
    357351  
    358352        if (data[IFLA_IPTUN_PROTO]) 
     
    401395  
    402396 static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev, 
    403 @@ -1654,6 +1861,12 @@ static void ip6_tnl_dellink(struct net_device *dev, struct list_head *head) 
     397@@ -1664,6 +1872,12 @@ static void ip6_tnl_dellink(struct net_d 
    404398  
    405399 static size_t ip6_tnl_get_size(const struct net_device *dev) 
     
    414408                /* IFLA_IPTUN_LINK */ 
    415409                nla_total_size(4) + 
    416 @@ -1671,6 +1884,24 @@ static size_t ip6_tnl_get_size(const struct net_device *dev) 
     410@@ -1681,6 +1895,24 @@ static size_t ip6_tnl_get_size(const str 
    417411                nla_total_size(4) + 
    418412                /* IFLA_IPTUN_PROTO */ 
     
    439433 } 
    440434  
    441 @@ -1678,6 +1909,9 @@ static int ip6_tnl_fill_info(struct sk_buff *skb, const struct net_device *dev) 
     435@@ -1688,6 +1920,9 @@ static int ip6_tnl_fill_info(struct sk_b 
    442436 { 
    443437        struct ip6_tnl *tunnel = netdev_priv(dev); 
     
    449443        if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) || 
    450444            nla_put(skb, IFLA_IPTUN_LOCAL, sizeof(struct in6_addr), 
    451 @@ -1688,8 +1922,27 @@ static int ip6_tnl_fill_info(struct sk_buff *skb, const struct net_device *dev) 
     445@@ -1698,8 +1933,27 @@ static int ip6_tnl_fill_info(struct sk_b 
    452446            nla_put_u8(skb, IFLA_IPTUN_ENCAP_LIMIT, parm->encap_limit) || 
    453447            nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) || 
     
    478472  
    479473 nla_put_failure: 
    480 @@ -1705,6 +1958,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = { 
     474@@ -1715,6 +1969,7 @@ static const struct nla_policy ip6_tnl_p 
    481475        [IFLA_IPTUN_FLOWINFO]           = { .type = NLA_U32 }, 
    482476        [IFLA_IPTUN_FLAGS]              = { .type = NLA_U32 }, 
     
    486480  
    487481 static struct rtnl_link_ops ip6_link_ops __read_mostly = { 
    488 --  
    489 1.9.1 
    490  
Note: See TracChangeset for help on using the changeset viewer.