projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
atm
/
ambassador.h
diff --git
a/drivers/atm/ambassador.h
b/drivers/atm/ambassador.h
index ff2a303cbe000325c71079d2846ffc98ed26fdba..bd1c46a7ef49de51282303bc3ed9b78d3a8669dd 100644
(file)
--- a/
drivers/atm/ambassador.h
+++ b/
drivers/atm/ambassador.h
@@
-638,7
+638,7
@@
struct amb_dev {
amb_txq txq;
amb_rxq rxq[NUM_RX_POOLS];
amb_txq txq;
amb_rxq rxq[NUM_RX_POOLS];
- struct
semaphore
vcc_sf;
+ struct
mutex
vcc_sf;
amb_tx_info txer[NUM_VCS];
struct atm_vcc * rxer[NUM_VCS];
unsigned int tx_avail;
amb_tx_info txer[NUM_VCS];
struct atm_vcc * rxer[NUM_VCS];
unsigned int tx_avail;
@@
-656,17
+656,6
@@
typedef struct amb_dev amb_dev;
#define AMB_DEV(atm_dev) ((amb_dev *) (atm_dev)->dev_data)
#define AMB_VCC(atm_vcc) ((amb_vcc *) (atm_vcc)->dev_data)
#define AMB_DEV(atm_dev) ((amb_dev *) (atm_dev)->dev_data)
#define AMB_VCC(atm_vcc) ((amb_vcc *) (atm_vcc)->dev_data)
-/* the microcode */
-
-typedef struct {
- u32 start;
- unsigned int count;
-} region;
-
-static region ucode_regions[];
-static u32 ucode_data[];
-static u32 ucode_start;
-
/* rate rounding */
typedef enum {
/* rate rounding */
typedef enum {