A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 19:21:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse source 
Three sets of overlapping changes.  Nothing serious.

Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
David S. Miller 2016-10-02 21:17:07 -04:00
commit b50afd203a
141 changed files with 899 additions and 605 deletions
Download patch file Download diff file Expand all files Collapse all files

1
net/ipv6/ip6_gre.c
View file

@ -648,7 +648,6 @@ static int ip6gre_xmit_other(struct sk_buff *skb, struct net_device *dev)
encap_limit = t->parms.encap_limit;
memcpy(&fl6, &t->fl.u.ip6, sizeof(fl6));
fl6.flowi6_proto = skb->protocol;
err = gre_handle_offloads(skb, !!(t->parms.o_flags & TUNNEL_CSUM));
if (err)

5
net/ipv6/ip6mr.c
View file

@ -2285,8 +2285,8 @@ static int __ip6mr_fill_mroute(struct mr6_table *mrt, struct sk_buff *skb,
return 1;
}
int ip6mr_get_route(struct net *net,
struct sk_buff *skb, struct rtmsg *rtm, int nowait)
int ip6mr_get_route(struct net *net, struct sk_buff *skb, struct rtmsg *rtm,
int nowait, u32 portid)
{
int err;
struct mr6_table *mrt;
@ -2331,6 +2331,7 @@ int ip6mr_get_route(struct net *net,
return -ENOMEM;
}
NETLINK_CB(skb2).portid = portid;
skb_reset_transport_header(skb2);
skb_put(skb2, sizeof(struct ipv6hdr));

4
net/ipv6/route.c
View file

@ -3216,7 +3216,9 @@ static int rt6_fill_node(struct net *net,
if (iif) {
#ifdef CONFIG_IPV6_MROUTE
if (ipv6_addr_is_multicast(&rt->rt6i_dst.addr)) {
int err = ip6mr_get_route(net, skb, rtm, nowait);
int err = ip6mr_get_route(net, skb, rtm, nowait,
portid);
if (err <= 0) {
if (!nowait) {
if (err == 0)