~ubuntu-branches/debian/experimental/linux-tools/experimental

« back to all changes in this revision

Viewing changes to include/net/gre.h

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings
  • Date: 2014-02-02 16:57:49 UTC
  • mfrom: (1.1.10) (0.1.21 sid)
  • Revision ID: package-import@ubuntu.com-20140202165749-tw94o9t1t0a8txk6
Tags: 3.13-1~exp2
Merge changes from sid up to 3.12.6-3

Show diffs side-by-side

added added

removed removed

Lines of Context:
38
38
 
39
39
void gre_build_header(struct sk_buff *skb, const struct tnl_ptk_info *tpi,
40
40
                      int hdr_len);
41
 
struct sk_buff *gre_handle_offloads(struct sk_buff *skb, bool gre_csum);
 
41
 
 
42
static inline struct sk_buff *gre_handle_offloads(struct sk_buff *skb,
 
43
                                                  bool gre_csum)
 
44
{
 
45
        return iptunnel_handle_offloads(skb, gre_csum, SKB_GSO_GRE);
 
46
}
 
47
 
42
48
 
43
49
static inline int ip_gre_calc_hlen(__be16 o_flags)
44
50
{