Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge 'net' bug fixes into 'net-next' as we have patches that will build on top of them. This merge commit includes a change from Emil Goode (emilgoode@gmail.com) that fixes a warning that would have been introduced by this merge. Specifically it fixes the pingv6_ops method ipv6_chk_addr() to add a "const" to the "struct net_device *dev" argument and likewise update the dummy_ipv6_chk_addr() declaration. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
6bc19fb82d
499 changed files with 7659 additions and 3706 deletions
|
@ -2758,6 +2758,21 @@ static inline int skb_tnl_header_len(const struct sk_buff *inner_skb)
|
|||
SKB_GSO_CB(inner_skb)->mac_offset;
|
||||
}
|
||||
|
||||
static inline int gso_pskb_expand_head(struct sk_buff *skb, int extra)
|
||||
{
|
||||
int new_headroom, headroom;
|
||||
int ret;
|
||||
|
||||
headroom = skb_headroom(skb);
|
||||
ret = pskb_expand_head(skb, extra, 0, GFP_ATOMIC);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
new_headroom = skb_headroom(skb);
|
||||
SKB_GSO_CB(skb)->mac_offset += (new_headroom - headroom);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline bool skb_is_gso(const struct sk_buff *skb)
|
||||
{
|
||||
return skb_shinfo(skb)->gso_size;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue