diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-05-18 15:02:27 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-05-18 15:02:27 -0700 |
| commit | 038c4bf85ba2bca715db3ca4d190de3e5299c6c3 (patch) | |
| tree | 087d4159caceecb334a322f5f1a3908d57159468 /include/linux | |
| parent | Input: vmmouse - disable vmmouse before entering suspend mode (diff) | |
| parent | dt-bindings: google,cros-ec-keyb: Fixup bad compatible match (diff) | |
| download | linux-dev-038c4bf85ba2bca715db3ca4d190de3e5299c6c3.tar.xz linux-dev-038c4bf85ba2bca715db3ca4d190de3e5299c6c3.zip | |
Merge branch 'ib/5.17-cros-ec-keyb' into next
Merge changes to ChromeOS EC Keyboard driver.
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; |