projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'clk-imx', 'clk-samsung', 'clk-ti', 'clk-uniphier-gear' and 'clk-mmp2...
[linux-2.6-microblaze.git]
/
drivers
/
net
/
ethernet
/
cavium
/
thunder
/
nic.h
diff --git
a/drivers/net/ethernet/cavium/thunder/nic.h
b/drivers/net/ethernet/cavium/thunder/nic.h
index
f4d8176
..
62636c1
100644
(file)
--- a/
drivers/net/ethernet/cavium/thunder/nic.h
+++ b/
drivers/net/ethernet/cavium/thunder/nic.h
@@
-271,7
+271,7
@@
struct xcast_addr_list {
};
struct nicvf_work {
};
struct nicvf_work {
- struct
delayed_work
work;
+ struct
work_struct
work;
u8 mode;
struct xcast_addr_list *mc;
};
u8 mode;
struct xcast_addr_list *mc;
};
@@
-327,7
+327,11
@@
struct nicvf {
struct nicvf_work rx_mode_work;
/* spinlock to protect workqueue arguments from concurrent access */
spinlock_t rx_mode_wq_lock;
struct nicvf_work rx_mode_work;
/* spinlock to protect workqueue arguments from concurrent access */
spinlock_t rx_mode_wq_lock;
-
+ /* workqueue for handling kernel ndo_set_rx_mode() calls */
+ struct workqueue_struct *nicvf_rx_mode_wq;
+ /* mutex to protect VF's mailbox contents from concurrent access */
+ struct mutex rx_mode_mtx;
+ struct delayed_work link_change_work;
/* PTP timestamp */
struct cavium_ptp *ptp_clock;
/* Inbound timestamping is on */
/* PTP timestamp */
struct cavium_ptp *ptp_clock;
/* Inbound timestamping is on */
@@
-575,10
+579,8
@@
struct set_ptp {
struct xcast {
u8 msg;
struct xcast {
u8 msg;
- union {
- u8 mode;
- u64 mac;
- } data;
+ u8 mode;
+ u64 mac:48;
};
/* 128 bit shared memory between PF and each VF */
};
/* 128 bit shared memory between PF and each VF */