Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Lots of overlapping changes and parallel additions, stuff like that. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -2291,7 +2291,8 @@ int ipmr_get_route(struct net *net, struct sk_buff *skb,
|
||||
rcu_read_unlock();
|
||||
return -ENODEV;
|
||||
}
|
||||
skb2 = skb_clone(skb, GFP_ATOMIC);
|
||||
|
||||
skb2 = skb_realloc_headroom(skb, sizeof(struct iphdr));
|
||||
if (!skb2) {
|
||||
read_unlock(&mrt_lock);
|
||||
rcu_read_unlock();
|
||||
|
Reference in New Issue
Block a user