diff options
| author | Rob Herring <robh@kernel.org> | 2015-03-10 10:03:04 -0400 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2015-03-10 10:03:04 -0400 |
| commit | 2c192699a7050ef5bdf1e2cc95fdddfbcf524509 (patch) | |
| tree | 945d4553691ecb24151a2fa83b7d489665dd3248 /include/linux/netdevice.h | |
| parent | 25e8f336e535d10c30216e1ba330fbea98dfccc5 (diff) | |
| parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) | |
Merge tag 'v4.0-rc3' into HEAD
Linux 4.0-rc3
Merging in v4.0-rc3 because commit 30a22c215a00 (console: Fix
console name size mismatch) is a dependency.
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 5897b4ea5a3f..429d1790a27e 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -2342,6 +2342,7 @@ struct gro_remcsum { | |||
| 2342 | 2342 | ||
| 2343 | static inline void skb_gro_remcsum_init(struct gro_remcsum *grc) | 2343 | static inline void skb_gro_remcsum_init(struct gro_remcsum *grc) |
| 2344 | { | 2344 | { |
| 2345 | grc->offset = 0; | ||
| 2345 | grc->delta = 0; | 2346 | grc->delta = 0; |
| 2346 | } | 2347 | } |
| 2347 | 2348 | ||