diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-09-12 14:41:59 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-09-12 14:41:58 -0700 |
| commit | 14f6bfeeebb97c02cbf0c43818f7998e3bdb3cae (patch) | |
| tree | 055fbddd1e98f289dc9c65cb65a8e37fc2dbc151 /include/net | |
| parent | 043f52c20a63011ae14175e56926076965d59353 (diff) | |
| parent | 03f50f905f9f7cadbb1b3cd82c078806bfd77703 (diff) | |
Merge "Merge android-4.4@610af85 (v4.4.85) into msm-4.4"
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ip.h | 4 | ||||
| -rw-r--r-- | include/net/sch_generic.h | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index 8a8376239eac..c10f73803845 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -317,7 +317,7 @@ static inline unsigned int ip_dst_mtu_maybe_forward(const struct dst_entry *dst, !forwarding) return dst_mtu(dst); - return min(dst->dev->mtu, IP_MAX_MTU); + return min(READ_ONCE(dst->dev->mtu), IP_MAX_MTU); } static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb) @@ -330,7 +330,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb) return ip_dst_mtu_maybe_forward(skb_dst(skb), forwarding); } - return min(skb_dst(skb)->dev->mtu, IP_MAX_MTU); + return min(READ_ONCE(skb_dst(skb)->dev->mtu), IP_MAX_MTU); } u32 ip_idents_reserve(u32 hash, int segs); diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index e5bba897d206..7a5d6a073165 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -717,8 +717,11 @@ static inline struct Qdisc *qdisc_replace(struct Qdisc *sch, struct Qdisc *new, old = *pold; *pold = new; if (old != NULL) { - qdisc_tree_reduce_backlog(old, old->q.qlen, old->qstats.backlog); + unsigned int qlen = old->q.qlen; + unsigned int backlog = old->qstats.backlog; + qdisc_reset(old); + qdisc_tree_reduce_backlog(old, qlen, backlog); } sch_tree_unlock(sch); |