~ [ source navigation ] ~ [ diff markup ] ~ [ identifier search ] ~

TOMOYO Linux Cross Reference
Linux/include/net/gre.h

Version: ~ [ linux-6.12-rc7 ] ~ [ linux-6.11.7 ] ~ [ linux-6.10.14 ] ~ [ linux-6.9.12 ] ~ [ linux-6.8.12 ] ~ [ linux-6.7.12 ] ~ [ linux-6.6.60 ] ~ [ linux-6.5.13 ] ~ [ linux-6.4.16 ] ~ [ linux-6.3.13 ] ~ [ linux-6.2.16 ] ~ [ linux-6.1.116 ] ~ [ linux-6.0.19 ] ~ [ linux-5.19.17 ] ~ [ linux-5.18.19 ] ~ [ linux-5.17.15 ] ~ [ linux-5.16.20 ] ~ [ linux-5.15.171 ] ~ [ linux-5.14.21 ] ~ [ linux-5.13.19 ] ~ [ linux-5.12.19 ] ~ [ linux-5.11.22 ] ~ [ linux-5.10.229 ] ~ [ linux-5.9.16 ] ~ [ linux-5.8.18 ] ~ [ linux-5.7.19 ] ~ [ linux-5.6.19 ] ~ [ linux-5.5.19 ] ~ [ linux-5.4.285 ] ~ [ linux-5.3.18 ] ~ [ linux-5.2.21 ] ~ [ linux-5.1.21 ] ~ [ linux-5.0.21 ] ~ [ linux-4.20.17 ] ~ [ linux-4.19.323 ] ~ [ linux-4.18.20 ] ~ [ linux-4.17.19 ] ~ [ linux-4.16.18 ] ~ [ linux-4.15.18 ] ~ [ linux-4.14.336 ] ~ [ linux-4.13.16 ] ~ [ linux-4.12.14 ] ~ [ linux-4.11.12 ] ~ [ linux-4.10.17 ] ~ [ linux-4.9.337 ] ~ [ linux-4.4.302 ] ~ [ linux-3.10.108 ] ~ [ linux-2.6.32.71 ] ~ [ linux-2.6.0 ] ~ [ linux-2.4.37.11 ] ~ [ unix-v6-master ] ~ [ ccs-tools-1.8.12 ] ~ [ policy-sample ] ~
Architecture: ~ [ i386 ] ~ [ alpha ] ~ [ m68k ] ~ [ mips ] ~ [ ppc ] ~ [ sparc ] ~ [ sparc64 ] ~

Diff markup

Differences between /include/net/gre.h (Version linux-6.12-rc7) and /include/net/gre.h (Version linux-4.12.14)


  1 /* SPDX-License-Identifier: GPL-2.0 */         << 
  2 #ifndef __LINUX_GRE_H                               1 #ifndef __LINUX_GRE_H
  3 #define __LINUX_GRE_H                               2 #define __LINUX_GRE_H
  4                                                     3 
  5 #include <linux/skbuff.h>                           4 #include <linux/skbuff.h>
  6 #include <net/ip_tunnels.h>                         5 #include <net/ip_tunnels.h>
  7                                                     6 
  8 struct gre_base_hdr {                               7 struct gre_base_hdr {
  9         __be16 flags;                               8         __be16 flags;
 10         __be16 protocol;                            9         __be16 protocol;
 11 } __packed;                                        10 } __packed;
 12                                                    11 
 13 struct gre_full_hdr {                              12 struct gre_full_hdr {
 14         struct gre_base_hdr fixed_header;          13         struct gre_base_hdr fixed_header;
 15         __be16 csum;                               14         __be16 csum;
 16         __be16 reserved1;                          15         __be16 reserved1;
 17         __be32 key;                                16         __be32 key;
 18         __be32 seq;                                17         __be32 seq;
 19 } __packed;                                        18 } __packed;
 20 #define GRE_HEADER_SECTION 4                       19 #define GRE_HEADER_SECTION 4
 21                                                    20 
 22 #define GREPROTO_CISCO          0                  21 #define GREPROTO_CISCO          0
 23 #define GREPROTO_PPTP           1                  22 #define GREPROTO_PPTP           1
 24 #define GREPROTO_MAX            2                  23 #define GREPROTO_MAX            2
 25 #define GRE_IP_PROTO_MAX        2                  24 #define GRE_IP_PROTO_MAX        2
 26                                                    25 
 27 struct gre_protocol {                              26 struct gre_protocol {
 28         int  (*handler)(struct sk_buff *skb);      27         int  (*handler)(struct sk_buff *skb);
 29         void (*err_handler)(struct sk_buff *sk     28         void (*err_handler)(struct sk_buff *skb, u32 info);
 30 };                                                 29 };
 31                                                    30 
 32 int gre_add_protocol(const struct gre_protocol     31 int gre_add_protocol(const struct gre_protocol *proto, u8 version);
 33 int gre_del_protocol(const struct gre_protocol     32 int gre_del_protocol(const struct gre_protocol *proto, u8 version);
 34                                                    33 
 35 struct net_device *gretap_fb_dev_create(struct     34 struct net_device *gretap_fb_dev_create(struct net *net, const char *name,
 36                                        u8 name     35                                        u8 name_assign_type);
 37 int gre_parse_header(struct sk_buff *skb, stru     36 int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi,
 38                      bool *csum_err, __be16 pr     37                      bool *csum_err, __be16 proto, int nhs);
 39                                                    38 
 40 static inline bool netif_is_gretap(const struc !!  39 static inline int gre_calc_hlen(__be16 o_flags)
 41 {                                              << 
 42         return dev->rtnl_link_ops &&           << 
 43                !strcmp(dev->rtnl_link_ops->kin << 
 44 }                                              << 
 45                                                << 
 46 static inline bool netif_is_ip6gretap(const st << 
 47 {                                              << 
 48         return dev->rtnl_link_ops &&           << 
 49                !strcmp(dev->rtnl_link_ops->kin << 
 50 }                                              << 
 51                                                << 
 52 static inline int gre_calc_hlen(const unsigned << 
 53 {                                                  40 {
 54         int addend = 4;                            41         int addend = 4;
 55                                                    42 
 56         if (test_bit(IP_TUNNEL_CSUM_BIT, o_fla !!  43         if (o_flags & TUNNEL_CSUM)
 57                 addend += 4;                       44                 addend += 4;
 58         if (test_bit(IP_TUNNEL_KEY_BIT, o_flag !!  45         if (o_flags & TUNNEL_KEY)
 59                 addend += 4;                       46                 addend += 4;
 60         if (test_bit(IP_TUNNEL_SEQ_BIT, o_flag !!  47         if (o_flags & TUNNEL_SEQ)
 61                 addend += 4;                       48                 addend += 4;
 62         return addend;                             49         return addend;
 63 }                                                  50 }
 64                                                    51 
 65 static inline void gre_flags_to_tnl_flags(unsi !!  52 static inline __be16 gre_flags_to_tnl_flags(__be16 flags)
 66 {                                                  53 {
 67         IP_TUNNEL_DECLARE_FLAGS(res) = { };    !!  54         __be16 tflags = 0;
 68                                                    55 
 69         __assign_bit(IP_TUNNEL_CSUM_BIT, res,  !!  56         if (flags & GRE_CSUM)
 70         __assign_bit(IP_TUNNEL_ROUTING_BIT, re !!  57                 tflags |= TUNNEL_CSUM;
 71         __assign_bit(IP_TUNNEL_KEY_BIT, res, f !!  58         if (flags & GRE_ROUTING)
 72         __assign_bit(IP_TUNNEL_SEQ_BIT, res, f !!  59                 tflags |= TUNNEL_ROUTING;
 73         __assign_bit(IP_TUNNEL_STRICT_BIT, res !!  60         if (flags & GRE_KEY)
 74         __assign_bit(IP_TUNNEL_REC_BIT, res, f !!  61                 tflags |= TUNNEL_KEY;
 75         __assign_bit(IP_TUNNEL_VERSION_BIT, re !!  62         if (flags & GRE_SEQ)
                                                   >>  63                 tflags |= TUNNEL_SEQ;
                                                   >>  64         if (flags & GRE_STRICT)
                                                   >>  65                 tflags |= TUNNEL_STRICT;
                                                   >>  66         if (flags & GRE_REC)
                                                   >>  67                 tflags |= TUNNEL_REC;
                                                   >>  68         if (flags & GRE_VERSION)
                                                   >>  69                 tflags |= TUNNEL_VERSION;
 76                                                    70 
 77         ip_tunnel_flags_copy(dst, res);        !!  71         return tflags;
 78 }                                                  72 }
 79                                                    73 
 80 static inline __be16 gre_tnl_flags_to_gre_flag !!  74 static inline __be16 gre_tnl_flags_to_gre_flags(__be16 tflags)
 81 {                                                  75 {
 82         __be16 flags = 0;                          76         __be16 flags = 0;
 83                                                    77 
 84         if (test_bit(IP_TUNNEL_CSUM_BIT, tflag !!  78         if (tflags & TUNNEL_CSUM)
 85                 flags |= GRE_CSUM;                 79                 flags |= GRE_CSUM;
 86         if (test_bit(IP_TUNNEL_ROUTING_BIT, tf !!  80         if (tflags & TUNNEL_ROUTING)
 87                 flags |= GRE_ROUTING;              81                 flags |= GRE_ROUTING;
 88         if (test_bit(IP_TUNNEL_KEY_BIT, tflags !!  82         if (tflags & TUNNEL_KEY)
 89                 flags |= GRE_KEY;                  83                 flags |= GRE_KEY;
 90         if (test_bit(IP_TUNNEL_SEQ_BIT, tflags !!  84         if (tflags & TUNNEL_SEQ)
 91                 flags |= GRE_SEQ;                  85                 flags |= GRE_SEQ;
 92         if (test_bit(IP_TUNNEL_STRICT_BIT, tfl !!  86         if (tflags & TUNNEL_STRICT)
 93                 flags |= GRE_STRICT;               87                 flags |= GRE_STRICT;
 94         if (test_bit(IP_TUNNEL_REC_BIT, tflags !!  88         if (tflags & TUNNEL_REC)
 95                 flags |= GRE_REC;                  89                 flags |= GRE_REC;
 96         if (test_bit(IP_TUNNEL_VERSION_BIT, tf !!  90         if (tflags & TUNNEL_VERSION)
 97                 flags |= GRE_VERSION;              91                 flags |= GRE_VERSION;
 98                                                    92 
 99         return flags;                              93         return flags;
100 }                                                  94 }
101                                                    95 
                                                   >>  96 static inline __sum16 gre_checksum(struct sk_buff *skb)
                                                   >>  97 {
                                                   >>  98         __wsum csum;
                                                   >>  99 
                                                   >> 100         if (skb->ip_summed == CHECKSUM_PARTIAL)
                                                   >> 101                 csum = lco_csum(skb);
                                                   >> 102         else
                                                   >> 103                 csum = skb_checksum(skb, 0, skb->len, 0);
                                                   >> 104         return csum_fold(csum);
                                                   >> 105 }
                                                   >> 106 
102 static inline void gre_build_header(struct sk_    107 static inline void gre_build_header(struct sk_buff *skb, int hdr_len,
103                                     const unsi !! 108                                     __be16 flags, __be16 proto,
104                                     __be32 key    109                                     __be32 key, __be32 seq)
105 {                                                 110 {
106         IP_TUNNEL_DECLARE_FLAGS(cond) = { };   << 
107         struct gre_base_hdr *greh;                111         struct gre_base_hdr *greh;
108                                                   112 
109         skb_push(skb, hdr_len);                   113         skb_push(skb, hdr_len);
110                                                   114 
111         skb_set_inner_protocol(skb, proto);       115         skb_set_inner_protocol(skb, proto);
112         skb_reset_transport_header(skb);          116         skb_reset_transport_header(skb);
113         greh = (struct gre_base_hdr *)skb->dat    117         greh = (struct gre_base_hdr *)skb->data;
114         greh->flags = gre_tnl_flags_to_gre_fla    118         greh->flags = gre_tnl_flags_to_gre_flags(flags);
115         greh->protocol = proto;                   119         greh->protocol = proto;
116                                                   120 
117         __set_bit(IP_TUNNEL_KEY_BIT, cond);    !! 121         if (flags & (TUNNEL_KEY | TUNNEL_CSUM | TUNNEL_SEQ)) {
118         __set_bit(IP_TUNNEL_CSUM_BIT, cond);   << 
119         __set_bit(IP_TUNNEL_SEQ_BIT, cond);    << 
120                                                << 
121         if (ip_tunnel_flags_intersect(flags, c << 
122                 __be32 *ptr = (__be32 *)(((u8     122                 __be32 *ptr = (__be32 *)(((u8 *)greh) + hdr_len - 4);
123                                                   123 
124                 if (test_bit(IP_TUNNEL_SEQ_BIT !! 124                 if (flags & TUNNEL_SEQ) {
125                         *ptr = seq;               125                         *ptr = seq;
126                         ptr--;                    126                         ptr--;
127                 }                                 127                 }
128                 if (test_bit(IP_TUNNEL_KEY_BIT !! 128                 if (flags & TUNNEL_KEY) {
129                         *ptr = key;               129                         *ptr = key;
130                         ptr--;                    130                         ptr--;
131                 }                                 131                 }
132                 if (test_bit(IP_TUNNEL_CSUM_BI !! 132                 if (flags & TUNNEL_CSUM &&
133                     !(skb_shinfo(skb)->gso_typ    133                     !(skb_shinfo(skb)->gso_type &
134                       (SKB_GSO_GRE | SKB_GSO_G    134                       (SKB_GSO_GRE | SKB_GSO_GRE_CSUM))) {
135                         *ptr = 0;                 135                         *ptr = 0;
136                         if (skb->ip_summed ==  !! 136                         *(__sum16 *)ptr = gre_checksum(skb);
137                                 *(__sum16 *)pt << 
138                         } else {               << 
139                                 skb->ip_summed << 
140                                 skb->csum_star << 
141                                 skb->csum_offs << 
142                         }                      << 
143                 }                                 137                 }
144         }                                         138         }
145 }                                                 139 }
146                                                   140 
147 #endif                                            141 #endif
148                                                   142 

~ [ source navigation ] ~ [ diff markup ] ~ [ identifier search ] ~

kernel.org | git.kernel.org | LWN.net | Project Home | SVN repository | Mail admin

Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.

sflogo.php