diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-01-19 12:04:27 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-01-19 12:04:27 +0800 |
commit | cb370744bc101be91a0bc3e9fbdb670ab44df97d (patch) | |
tree | 1a84448b43dee0f4e255f9434e776c51812ddb35 /include | |
parent | 67f07b48af22065412ba4e78472121c0a9f58329 (diff) | |
parent | f40b3cc69de8c97bbcdb74e3cffda06ffcad2cd7 (diff) |
Merge tag 'v4.1.38' into linux-linaro-lsk-v4.1lsk-v4.1-17.02
This is the 4.1.38 stable release
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/netdevice.h | 4 | ||||
-rw-r--r-- | include/net/ip.h | 2 | ||||
-rw-r--r-- | include/rdma/ib_addr.h | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index ddd47c3a757d..c11f9d1963c3 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1940,8 +1940,8 @@ struct napi_gro_cb { /* This is non-zero if the packet may be of the same flow. */ u8 same_flow:1; - /* Used in udp_gro_receive */ - u8 udp_mark:1; + /* Used in tunnel GRO receive */ + u8 encap_mark:1; /* GRO checksum is valid */ u8 csum_valid:1; diff --git a/include/net/ip.h b/include/net/ip.h index f41fc497b21b..117bde93995d 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -234,6 +234,8 @@ static inline int inet_is_local_reserved_port(struct net *net, int port) } #endif +__be32 inet_current_timestamp(void); + /* From inetpeer.c */ extern int inet_peer_threshold; extern int inet_peer_minttl; diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h index ac54c27a2bfd..e6796dc8c764 100644 --- a/include/rdma/ib_addr.h +++ b/include/rdma/ib_addr.h @@ -183,10 +183,12 @@ static inline void iboe_addr_get_sgid(struct rdma_dev_addr *dev_addr, dev = dev_get_by_index(&init_net, dev_addr->bound_dev_if); if (dev) { - ip4 = (struct in_device *)dev->ip_ptr; - if (ip4 && ip4->ifa_list && ip4->ifa_list->ifa_address) + ip4 = in_dev_get(dev); + if (ip4 && ip4->ifa_list && ip4->ifa_list->ifa_address) { ipv6_addr_set_v4mapped(ip4->ifa_list->ifa_address, (struct in6_addr *)gid); + in_dev_put(ip4); + } dev_put(dev); } } |