openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

cnic: Fix iSCSI TCP port endian order. 

Pass the TCP port parameter for iSCSI connections to the firmware in
proper endian order.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael Chan 2010-12-23 07:42:56 +00:00 committed by David S. Miller
parent a130883d95
commit 9b09336072
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/cnic.c
View File

@ -2883,7 +2883,7 @@ static void cnic_cm_cleanup(struct cnic_sock *csk)
struct cnic_dev *dev = csk->dev;
struct cnic_local *cp = dev->cnic_priv;
cnic_free_id(&cp->csk_port_tbl, csk->src_port);
cnic_free_id(&cp->csk_port_tbl, be16_to_cpu(csk->src_port));
csk->src_port = 0;
}
}
@ -3014,7 +3014,8 @@ static int cnic_get_route(struct cnic_sock *csk, struct cnic_sockaddr *saddr)
int is_v6, rc = 0;
struct dst_entry *dst = NULL;
struct net_device *realdev;
u32 local_port;
__be16 local_port;
u32 port_id;
if (saddr->local.v6.sin6_family == AF_INET6 &&
saddr->remote.v6.sin6_family == AF_INET6)
@ -3054,19 +3055,21 @@ static int cnic_get_route(struct cnic_sock *csk, struct cnic_sockaddr *saddr)
}
}
if (local_port >= CNIC_LOCAL_PORT_MIN &&
local_port < CNIC_LOCAL_PORT_MAX) {
if (cnic_alloc_id(&cp->csk_port_tbl, local_port))
local_port = 0;
port_id = be16_to_cpu(local_port);
if (port_id >= CNIC_LOCAL_PORT_MIN &&
port_id < CNIC_LOCAL_PORT_MAX) {
if (cnic_alloc_id(&cp->csk_port_tbl, port_id))
port_id = 0;
} else
local_port = 0;
port_id = 0;
if (!local_port) {
local_port = cnic_alloc_new_id(&cp->csk_port_tbl);
if (local_port == -1) {
if (!port_id) {
port_id = cnic_alloc_new_id(&cp->csk_port_tbl);
if (port_id == -1) {
rc = -ENOMEM;
goto err_out;
}
local_port = cpu_to_be16(port_id);
}
csk->src_port = local_port;

2
drivers/net/cnic.h
View File

@ -82,7 +82,7 @@ struct cnic_redirect_entry {
#define MAX_ISCSI_TBL_SZ 256
#define CNIC_LOCAL_PORT_MIN 60000
#define CNIC_LOCAL_PORT_MAX 61000
#define CNIC_LOCAL_PORT_MAX 61024
#define CNIC_LOCAL_PORT_RANGE (CNIC_LOCAL_PORT_MAX - CNIC_LOCAL_PORT_MIN)
#define KWQE_CNT (BCM_PAGE_SIZE / sizeof(struct kwqe))