diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-06 12:03:07 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-06 12:03:07 +0800 |
| commit | d69f58e2b8396658b7577113f9887bd4d66d25f8 (patch) | |
| tree | 217a2a766669c825645f5ff5b64ff6fcc875efc5 /net/core/dev.c | |
| parent | efa59a01f75e4b1e1b870cbdbb4ffd5a0ab27caf (diff) | |
| parent | 4686ea264f1dfec6bc5db9ef4bb9ed5babbb78cd (diff) | |
Merge tag 'v4.4.47' into linux-linaro-lsk-v4.4
This is the 4.4.47 stable release
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 6f203c7fb166..0798a0f1b395 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2650,9 +2650,9 @@ static netdev_features_t harmonize_features(struct sk_buff *skb, if (skb->ip_summed != CHECKSUM_NONE && !can_checksum_protocol(features, type)) { features &= ~NETIF_F_ALL_CSUM; - } else if (illegal_highdma(skb->dev, skb)) { - features &= ~NETIF_F_SG; } + if (illegal_highdma(skb->dev, skb)) + features &= ~NETIF_F_SG; return features; } |