diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-05-10 17:06:04 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-05-10 17:06:04 +0300 |
| commit | 2e00fde5c6ed8535244332ebb55e881baa54ae46 (patch) | |
| tree | f578e02ef1dc6e59630f09404bb2f58500876811 /include/linux/netdevice.h | |
| parent | 39f0ccde3624e7cf882faccf7f72a47b7a763bfb (diff) | |
| parent | 3231e2053eaeee70bdfb216a78a30f11e88e2243 (diff) | |
| download | linux-2e00fde5c6ed8535244332ebb55e881baa54ae46.tar.xz | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index cb0d5d09c2e4..8395308a2445 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2120,7 +2120,10 @@ struct napi_gro_cb { /* Used in foo-over-udp, set in udp[46]_gro_receive */ u8 is_ipv6:1; - /* 7 bit hole */ + /* Used in GRE, set in fou/gue_gro_receive */ + u8 is_fou:1; + + /* 6 bit hole */ /* used to support CHECKSUM_COMPLETE for tunneling protocols */ __wsum csum; |