aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-05 17:54:29 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-05 17:54:29 -0400
commitcc998ff8811530be521f6b316f37ab7676a07938 (patch)
treea054b3bf4b2ef406bf756a6cfc9be2f9115f17ae /drivers/scsi
parent57d730924d5cc2c3e280af16a9306587c3a511db (diff)
parent0d40f75bdab241868c0eb6f97aef9f8b3a66f7b3 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Pull networking changes from David Miller: "Noteworthy changes this time around: 1) Multicast rejoin support for team driver, from Jiri Pirko. 2) Centralize and simplify TCP RTT measurement handling in order to reduce the impact of bad RTO seeding from SYN/ACKs. Also, when both timestamps and local RTT measurements are available prefer the later because there are broken middleware devices which scramble the timestamp. From Yuchung Cheng. 3) Add TCP_NOTSENT_LOWAT socket option to limit the amount of kernel memory consumed to queue up unsend user data. From Eric Dumazet. 4) Add a "physical port ID" abstraction for network devices, from Jiri Pirko. 5) Add a "suppress" operation to influence fib_rules lookups, from Stefan Tomanek. 6) Add a networking development FAQ, from Paul Gortmaker. 7) Extend the information provided by tcp_probe and add ipv6 support, from Daniel Borkmann. 8) Use RCU locking more extensively in openvswitch data paths, from Pravin B Shelar. 9) Add SCTP support to openvswitch, from Joe Stringer. 10) Add EF10 chip support to SFC driver, from Ben Hutchings. 11) Add new SYNPROXY netfilter target, from Patrick McHardy. 12) Compute a rate approximation for sending in TCP sockets, and use this to more intelligently coalesce TSO frames. Furthermore, add a new packet scheduler which takes advantage of this estimate when available. From Eric Dumazet. 13) Allow AF_PACKET fanouts with random selection, from Daniel Borkmann. 14) Add ipv6 support to vxlan driver, from Cong Wang" Resolved conflicts as per discussion. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1218 commits) openvswitch: Fix alignment of struct sw_flow_key. netfilter: Fix build errors with xt_socket.c tcp: Add missing braces to do_tcp_setsockopt caif: Add missing braces to multiline if in cfctrl_linkup_request bnx2x: Add missing braces in bnx2x:bnx2x_link_initialize vxlan: Fix kernel panic on device delete. net: mvneta: implement ->ndo_do_ioctl() to support PHY ioctls net: mvneta: properly disable HW PHY polling and ensure adjust_link() works icplus: Use netif_running to determine device state ethernet/arc/arc_emac: Fix huge delays in large file copies tuntap: orphan frags before trying to set tx timestamp tuntap: purge socket error queue on detach qlcnic: use standard NAPI weights ipv6:introduce function to find route for redirect bnx2x: VF RSS support - VF side bnx2x: VF RSS support - PF side vxlan: Notify drivers for listening UDP port changes net: usbnet: update addr_assign_type if appropriate driver/net: enic: update enic maintainers and driver driver/net: enic: Exposing symbols for Cisco's low latency driver ...
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/bnx2i/57xx_iscsi_hsi.h12
-rw-r--r--drivers/scsi/bnx2i/bnx2i_init.c12
2 files changed, 13 insertions, 11 deletions
diff --git a/drivers/scsi/bnx2i/57xx_iscsi_hsi.h b/drivers/scsi/bnx2i/57xx_iscsi_hsi.h
index 37049e433c9e..7052a839b0ea 100644
--- a/drivers/scsi/bnx2i/57xx_iscsi_hsi.h
+++ b/drivers/scsi/bnx2i/57xx_iscsi_hsi.h
@@ -581,8 +581,10 @@ struct iscsi_kwqe_init1 {
581#define ISCSI_KWQE_INIT1_DELAYED_ACK_ENABLE_SHIFT 4 581#define ISCSI_KWQE_INIT1_DELAYED_ACK_ENABLE_SHIFT 4
582#define ISCSI_KWQE_INIT1_KEEP_ALIVE_ENABLE (0x1<<5) 582#define ISCSI_KWQE_INIT1_KEEP_ALIVE_ENABLE (0x1<<5)
583#define ISCSI_KWQE_INIT1_KEEP_ALIVE_ENABLE_SHIFT 5 583#define ISCSI_KWQE_INIT1_KEEP_ALIVE_ENABLE_SHIFT 5
584#define ISCSI_KWQE_INIT1_RESERVED1 (0x3<<6) 584#define ISCSI_KWQE_INIT1_TIME_STAMPS_ENABLE (0x1<<6)
585#define ISCSI_KWQE_INIT1_RESERVED1_SHIFT 6 585#define ISCSI_KWQE_INIT1_TIME_STAMPS_ENABLE_SHIFT 6
586#define ISCSI_KWQE_INIT1_RESERVED1 (0x1<<7)
587#define ISCSI_KWQE_INIT1_RESERVED1_SHIFT 7
586 u16 cq_num_wqes; 588 u16 cq_num_wqes;
587#elif defined(__LITTLE_ENDIAN) 589#elif defined(__LITTLE_ENDIAN)
588 u16 cq_num_wqes; 590 u16 cq_num_wqes;
@@ -593,8 +595,10 @@ struct iscsi_kwqe_init1 {
593#define ISCSI_KWQE_INIT1_DELAYED_ACK_ENABLE_SHIFT 4 595#define ISCSI_KWQE_INIT1_DELAYED_ACK_ENABLE_SHIFT 4
594#define ISCSI_KWQE_INIT1_KEEP_ALIVE_ENABLE (0x1<<5) 596#define ISCSI_KWQE_INIT1_KEEP_ALIVE_ENABLE (0x1<<5)
595#define ISCSI_KWQE_INIT1_KEEP_ALIVE_ENABLE_SHIFT 5 597#define ISCSI_KWQE_INIT1_KEEP_ALIVE_ENABLE_SHIFT 5
596#define ISCSI_KWQE_INIT1_RESERVED1 (0x3<<6) 598#define ISCSI_KWQE_INIT1_TIME_STAMPS_ENABLE (0x1<<6)
597#define ISCSI_KWQE_INIT1_RESERVED1_SHIFT 6 599#define ISCSI_KWQE_INIT1_TIME_STAMPS_ENABLE_SHIFT 6
600#define ISCSI_KWQE_INIT1_RESERVED1 (0x1<<7)
601#define ISCSI_KWQE_INIT1_RESERVED1_SHIFT 7
598 u8 cq_log_wqes_per_page; 602 u8 cq_log_wqes_per_page;
599#endif 603#endif
600#if defined(__BIG_ENDIAN) 604#if defined(__BIG_ENDIAN)
diff --git a/drivers/scsi/bnx2i/bnx2i_init.c b/drivers/scsi/bnx2i/bnx2i_init.c
index b6f6f436777b..34c294b42c84 100644
--- a/drivers/scsi/bnx2i/bnx2i_init.c
+++ b/drivers/scsi/bnx2i/bnx2i_init.c
@@ -172,16 +172,14 @@ void bnx2i_start(void *handle)
172 struct bnx2i_hba *hba = handle; 172 struct bnx2i_hba *hba = handle;
173 int i = HZ; 173 int i = HZ;
174 174
175 /* 175 /* On some bnx2x devices, it is possible that iSCSI is no
176 * We should never register devices that don't support iSCSI 176 * longer supported after firmware is downloaded. In that
177 * (see bnx2i_init_one), so something is wrong if we try to 177 * case, the iscsi_init_msg will return failure.
178 * start a iSCSI adapter on hardware with 0 supported iSCSI
179 * connections
180 */ 178 */
181 BUG_ON(!hba->cnic->max_iscsi_conn);
182 179
183 bnx2i_send_fw_iscsi_init_msg(hba); 180 bnx2i_send_fw_iscsi_init_msg(hba);
184 while (!test_bit(ADAPTER_STATE_UP, &hba->adapter_state) && i--) 181 while (!test_bit(ADAPTER_STATE_UP, &hba->adapter_state) &&
182 !test_bit(ADAPTER_STATE_INIT_FAILED, &hba->adapter_state) && i--)
185 msleep(BNX2I_INIT_POLL_TIME); 183 msleep(BNX2I_INIT_POLL_TIME);
186} 184}
187 185