OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
[uclinux-h8/linux.git]
/
drivers
/
net
/
ethernet
/
broadcom
/
bcmsysport.h
diff --git
a/drivers/net/ethernet/broadcom/bcmsysport.h
b/drivers/net/ethernet/broadcom/bcmsysport.h
index
0887e63
..
0b192fe
100644
(file)
--- 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>
#define __BCM_SYSPORT_H
#include <linux/bitmap.h>
+#include <linux/ethtool.h>
#include <linux/if_vlan.h>
#include <linux/net_dim.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;
unsigned int crc_fwd:1;
u16 rev;
u32 wolopts;
+ u8 sopass[SOPASS_MAX];
unsigned int wol_irq_disabled:1;
/* MIB related fields */
unsigned int wol_irq_disabled:1;
/* MIB related fields */