diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2022-03-21 10:57:51 +0100 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2022-03-22 21:12:14 +0100 |
| commit | b9067cd80fbc5b3ae061e5bde6efd19bbf02f9e2 (patch) | |
| tree | fdaaed7ef09b95c42def87363f084a4f46b7369f /include/linux | |
| parent | f6a2c2b2de817078ac5a7e58c10e746165e7825d (diff) | |
| parent | fe83f5eae432ccc8e90082d6ed506d5233547473 (diff) | |
Merge branch 'kvm/kvm-sls-fix'
Sync with the last minute SLS fix to extend it for IBT.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_arp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h index b712217f7030..1ed52441972f 100644 --- a/include/linux/if_arp.h +++ b/include/linux/if_arp.h @@ -52,6 +52,7 @@ static inline bool dev_is_mac_header_xmit(const struct net_device *dev) case ARPHRD_VOID: case ARPHRD_NONE: case ARPHRD_RAWIP: + case ARPHRD_PIMREG: return false; default: return true; |