diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-02-20 20:51:33 +0100 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-02-20 20:51:33 +0100 |
commit | 4509209f8bfe158403a29d713bd3b2cb8fc2b534 (patch) | |
tree | 952962ad15753569bce64df01410217f900e06aa /drivers/net/ethernet/broadcom/bcmsysport.h | |
parent | 35c0272502cca0a1b461d310c23aac94a503983d (diff) | |
parent | 32ea33a044842ae6c5fc7e33426e0a7bd50f8801 (diff) | |
download | linux-4509209f8bfe158403a29d713bd3b2cb8fc2b534.tar.bz2 |
Pull in char-misc-next from Greg
We need 32ea33a04484 ("mei: bus: export to_mei_cl_device for mei
client devices drivers") for the mei-hdcp patches.
References: https://lkml.org/lkml/2019/2/19/356
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bcmsysport.h')
-rw-r--r-- | drivers/net/ethernet/broadcom/bcmsysport.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.h b/drivers/net/ethernet/broadcom/bcmsysport.h index 0887e6356649..0b192fea9c5d 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.h +++ b/drivers/net/ethernet/broadcom/bcmsysport.h @@ -12,6 +12,7 @@ #define __BCM_SYSPORT_H #include <linux/bitmap.h> +#include <linux/ethtool.h> #include <linux/if_vlan.h> #include <linux/net_dim.h> @@ -778,6 +779,7 @@ struct bcm_sysport_priv { unsigned int crc_fwd:1; u16 rev; u32 wolopts; + u8 sopass[SOPASS_MAX]; unsigned int wol_irq_disabled:1; /* MIB related fields */ |