diff options
Diffstat (limited to 'drivers/message/fusion/mptlan.c')
-rw-r--r-- | drivers/message/fusion/mptlan.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c index 01fc397fdd97..9d9eb761934b 100644 --- a/drivers/message/fusion/mptlan.c +++ b/drivers/message/fusion/mptlan.c | |||
@@ -154,7 +154,7 @@ static unsigned short mpt_lan_type_trans(struct sk_buff *skb, | |||
154 | /* | 154 | /* |
155 | * Fusion MPT LAN private data | 155 | * Fusion MPT LAN private data |
156 | */ | 156 | */ |
157 | static int LanCtx = -1; | 157 | static u8 LanCtx = MPT_MAX_PROTOCOL_DRIVERS; |
158 | 158 | ||
159 | static u32 max_buckets_out = 127; | 159 | static u32 max_buckets_out = 127; |
160 | static u32 tx_max_out_p = 127 - 16; | 160 | static u32 tx_max_out_p = 127 - 16; |
@@ -165,12 +165,6 @@ DEFINE_RWLOCK(bad_naa_lock); | |||
165 | #endif | 165 | #endif |
166 | 166 | ||
167 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 167 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
168 | /* | ||
169 | * Fusion MPT LAN external data | ||
170 | */ | ||
171 | extern int mpt_lan_index; | ||
172 | |||
173 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | ||
174 | /** | 168 | /** |
175 | * lan_reply - Handle all data sent from the hardware. | 169 | * lan_reply - Handle all data sent from the hardware. |
176 | * @ioc: Pointer to MPT_ADAPTER structure | 170 | * @ioc: Pointer to MPT_ADAPTER structure |
@@ -1510,9 +1504,6 @@ static int __init mpt_lan_init (void) | |||
1510 | return -EBUSY; | 1504 | return -EBUSY; |
1511 | } | 1505 | } |
1512 | 1506 | ||
1513 | /* Set the callback index to be used by driver core for turbo replies */ | ||
1514 | mpt_lan_index = LanCtx; | ||
1515 | |||
1516 | dlprintk((KERN_INFO MYNAM ": assigned context of %d\n", LanCtx)); | 1507 | dlprintk((KERN_INFO MYNAM ": assigned context of %d\n", LanCtx)); |
1517 | 1508 | ||
1518 | if (mpt_reset_register(LanCtx, mpt_lan_ioc_reset)) { | 1509 | if (mpt_reset_register(LanCtx, mpt_lan_ioc_reset)) { |
@@ -1533,10 +1524,9 @@ static void __exit mpt_lan_exit(void) | |||
1533 | mpt_device_driver_deregister(MPTLAN_DRIVER); | 1524 | mpt_device_driver_deregister(MPTLAN_DRIVER); |
1534 | mpt_reset_deregister(LanCtx); | 1525 | mpt_reset_deregister(LanCtx); |
1535 | 1526 | ||
1536 | if (LanCtx >= 0) { | 1527 | if (LanCtx) { |
1537 | mpt_deregister(LanCtx); | 1528 | mpt_deregister(LanCtx); |
1538 | LanCtx = -1; | 1529 | LanCtx = MPT_MAX_PROTOCOL_DRIVERS; |
1539 | mpt_lan_index = 0; | ||
1540 | } | 1530 | } |
1541 | } | 1531 | } |
1542 | 1532 | ||